rename some things, add a test suite for the overrides