Clean up tests (fix twice-defined method).