mattdrayer/api-invalid-test-cleanup: Profiler-driven refactoring