fixed test cases
Merge branch 'dev' of https://github.com/TEAMMATES/repo into dev
final fixes to test cases