Added more unit tests
Merge branch 'master' of https://github.com/Cerium/Labyrith1