Adding more owner tests, and removing references to owner from a lot of other tests.