Merge "Clean up of integration-test base classes"