More tests
Added comment about code quality here