fixed refactoring errors
Added new tests and test coverage reports