Complete override entities. Add tests.