Add more tests
Merge branch 'master' of github.com:zuav/tests