some test improvements
Merge branch 'master' of https://github.com/r01010010/wizco

Conflicts:
	README.md