fixing of two tests
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into bootstrap