More hacking to fix integration tests