Hopefully fixed integration tests