Clean up report gen code, print test name