CFY-1433 fix unit tests