Cleanup up comments in test