Improved test coverage. Some refactoring