Update schema for testing
Deleted unecessary test checking :recommended_time to be true, changed has_and_belongs_to_many relationship to two has_many tests
Change test from one have_and_belong_to_many to two have_manys
Fixed merge conflicted files