[WIP] Fix integration specs