Initial work on cleaning integration specs