Done! Also changed check for multiple calls with assert_has_calls