CTest6 improved