Converting integration tests to new base class