Extra tests
Cleanup
CL