Updated CL. Fixed tests.