Ensure overrides work correctly, update tests for better coverage.