fixes tests on master
Merge branch 'master' of https://github.com/codalab/codalab