moved overrides, manager and tests
moved overrides, manager and tests