Fix clean variable names
Added test for clean