Add whitespace
Clean the test cleaning code