Reorganize cuke tests