Plow test/CMakeLists to logically arrange tests