Add more test classes
Merge branch 'master' of ../stage