Fix tests
Merge branch 'master' of github.com:rage/codebrowser-back-end