starting to fix tests
Merge branch 'features/new_schema' of github.com:andrewhl/AdvancedStudyRoom into features/new_schema
merging
Merge branch 'features/new_schema' of github.com:andrewhl/AdvancedStudyRoom into features/new_schema
refactoring tests