Added and arranged overrides tests.