test cleanup: remove unnecessary clear, add/remove whitespace