WIP: Fix integration tests