#187. unit tests updated