#182. unit tests refactored
#182. unit tests completed