Removed deleted file from CMake
Restored second arg to a TEST_CASE for non variadic compilers
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	projects/CMake/CMakeLists.txt