Updated CL tests