Cleanup test format