Merge "Move CF only tests to CF test mapping suite" into main