WIP: fixing integration tests