small refactor
tests refactored
tests passed
test base: changed dates. rebuild 1.1.2