Additional tests and some refactoring