add logging for cleanup. keep testFile name consistent with test name
simplify
minor fixes