Merge pull request #42 from jereln/fix_tests

add cancelled_id to appointments
fix mailer tests