Starting to fix integration tests