More integration tests fixes