push total tests to 41 and code coverage to 82%

added also some more refactoring