Remove the need for integration specific test subclasses