Fix integration tests and remove base test class