Adding more tests. Refactoring test suite.