Clean up from some more tests