diff --git a/app/models/recipient_list.rb b/app/models/recipient_list.rb
index 98a0a2df..dc4a046d 100644
--- a/app/models/recipient_list.rb
+++ b/app/models/recipient_list.rb
@@ -33,7 +33,7 @@ class RecipientList < ApplicationRecord
       new_ids = recipient_ids.split(/,/)
       (old_ids - new_ids).each do |deleted_recipient|
         schedules.each do |schedule|
-          schedule.recipient_schedules.for(deleted_recipient).first.destroy
+          schedule.recipient_schedules.for_recipient(deleted_recipient).first.destroy
         end
       end
 
diff --git a/spec/lib/tasks/survey_rake_spec.rb b/spec/lib/tasks/survey_rake_spec.rb
index 41b89572..4ac40645 100644
--- a/spec/lib/tasks/survey_rake_spec.rb
+++ b/spec/lib/tasks/survey_rake_spec.rb
@@ -105,7 +105,7 @@ describe "survey:attempt_questions" do
     describe 'Second Attempts' do
       before :each do
         recipients.each do |recipient|
-          recipient_schedule = schedule.recipient_schedules.for(recipient).first
+          recipient_schedule = schedule.recipient_schedules.for_recipient(recipient).first
           recipient_schedule.attempt_question
         end
       end
@@ -161,7 +161,7 @@ describe "survey:attempt_questions" do
 
           Timecop.freeze(now + 7)
           recipients.each do |recipient|
-            recipient_schedule = schedule.recipient_schedules.for(recipient).first
+            recipient_schedule = schedule.recipient_schedules.for_recipient(recipient).first
             recipient_schedule.attempt_question
           end
 
@@ -185,7 +185,7 @@ describe "survey:attempt_questions" do
         end
 
         it 'should not send anything to anyone else' do
-          expect(FakeSMS.messages.length).to eq(@existing_message_count + 2)
+          expect(FakeSMS.messages.length).to eq(@existing_message_count + 1)
           expect(recipients[0].attempts.count).to eq(1)
           expect(recipients[1].attempts.count).to eq(2)
         end
@@ -206,9 +206,10 @@ describe "survey:attempt_questions" do
       }
 
       describe 'With A FOR_CHILD Question Is Asked' do
+        let!(:date) { ActiveSupport::TimeZone["UTC"].parse(now.strftime("%Y-%m-%dT20:00:00%z")) }
+
         before :each do
           questions.first.update_attributes(for_recipient_students: true)
-          date = ActiveSupport::TimeZone["UTC"].parse(now.strftime("%Y-%m-%dT20:00:00%z"))
           Timecop.freeze(date) { subject.invoke }
         end
 
@@ -227,7 +228,7 @@ describe "survey:attempt_questions" do
         end
 
         it 'should set the next_attempt_at to now when attempt is made on first student' do
-          recipient.attempts.last.save_response(answer_index: 3)
+          students_recipient.attempts.last.save_response(answer_index: 3)
           expect(students_recipient_schedule.reload.next_attempt_at).to eq(Time.new)
         end
 
@@ -249,17 +250,21 @@ describe "survey:attempt_questions" do
 
           attempt = students_recipient.attempts.last
           expect(attempt.student).to eq(students_recipient.students[1])
+
+          Timecop.freeze(date + 1.day)
           attempt.save_response(answer_index: 4)
-          expect(students_recipient_schedule.reload.next_attempt_at).to eq(Time.new)
+          expect(students_recipient_schedule.reload.next_attempt_at).to eq(date + 1.day)
 
           expect{students_recipient_schedule.attempt_question}.to change{students_recipient.attempts.count}.by(1)
           expect(students_recipient_schedule.reload.queued_question_ids).to be_nil
-          expect(students_recipient_schedule.reload.next_attempt_at).to_not eq(Time.new)
+          expect(students_recipient_schedule.reload.next_attempt_at).to_not eq(date + (60 * 60 * schedule.frequency_hours))
 
           attempt = students_recipient.attempts.last
           expect(attempt.student).to eq(students_recipient.students[2])
+
+          Timecop.freeze(date + 2.days)
           attempt.save_response(answer_index: 2)
-          expect(students_recipient_schedule.reload.next_attempt_at).to_not eq(Time.new)
+          expect(students_recipient_schedule.reload.next_attempt_at).to_not eq(date + 2.days)
         end
 
         it 'should mention the students name in the text'
diff --git a/spec/models/attempt_spec.rb b/spec/models/attempt_spec.rb
index 4c4e3776..86b04a40 100644
--- a/spec/models/attempt_spec.rb
+++ b/spec/models/attempt_spec.rb
@@ -92,13 +92,13 @@ RSpec.describe Attempt, type: :model do
     end
 
     it 'should contact the Twilio API' do
-      expect(FakeSMS.messages.length).to eq(2)
-      
-      expect(FakeSMS.messages.first.to).to eq('111111111')
-      expect(FakeSMS.messages.first.body).to eq("Question 0:1")
+      expect(FakeSMS.messages.length).to eq(1)
+
+      # expect(FakeSMS.messages.first.to).to eq('111111111')
+      # expect(FakeSMS.messages.first.body).to eq("Question 0:1")
 
       expect(FakeSMS.messages.last.to).to eq('111111111')
-      expect(FakeSMS.messages.last.body).to eq("Option 0:1 A: Reply 1\n\rOption 0:1 B: Reply 2\n\rOption 0:1 C: Reply 3\n\rOption 0:1 D: Reply 4\n\rOption 0:1 E: Reply 5\n\rReply 'stop' to stop these messages.")
+      expect(FakeSMS.messages.last.body).to eq("Question 0:1\r\nOption 0:1 A: Reply 1\n\rOption 0:1 B: Reply 2\n\rOption 0:1 C: Reply 3\n\rOption 0:1 D: Reply 4\n\rOption 0:1 E: Reply 5\n\rReply 'stop' to stop these messages.")
     end
 
     it 'should update sent_at' do
diff --git a/spec/models/recipient_schedule_spec.rb b/spec/models/recipient_schedule_spec.rb
index 47c84cff..6243ac83 100644
--- a/spec/models/recipient_schedule_spec.rb
+++ b/spec/models/recipient_schedule_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe RecipientSchedule, type: :model do
       frequency_hours: 24
     )
   end
-  let!(:recipient_schedule) { schedule.recipient_schedules.for(recipient).first }
+  let!(:recipient_schedule) { schedule.recipient_schedules.for_recipient(recipient).first }
 
   let!(:not_ready_recipient_schedule) do
     RecipientSchedule.create!(
@@ -121,7 +121,7 @@ RSpec.describe RecipientSchedule, type: :model do
         date += 1.day
         date += 1.day if date.on_weekend?
 
-        expect(recipient_schedule.next_attempt_at).to eq(date.to_time)
+        expect(recipient_schedule.reload.next_attempt_at).to eq(date.to_time)
       end
     end
   end