bumped tests count up to 41 and code coverage to 82%  + more refactoring