improved tests
Merge branch 'Iteration-6' of github.com:NintenJoe/zol into Iteration-6