Use set_overrides
Fix a test discovery braino