More integration specs

And better integration spec infrastructure