Finished tests
Merge branch 'master' of https://github.com/zodiac/appspot-grading