CFY-1232 do some test refactoring/moving around