Trying to fix integration tests