Various cmake cleanups and fixups.
Use TEST_GROUP instead of FOLDER in cmake to make intention clear.