More integration test refactoring to be able to work with pydev