Added tests
Merge branch 'master' of https://www.github.com/defuyun/ass2_game