Moved majority of the test code to cl_tests.hpp