Fix up them integration tests