working on tests
Merge branch 'master' of https://github.com/alfy32/school