CFY-1272 refining tests