test cleanup and fix