Fix test cleanup
Formatting