CFY-1046 fix unit tests