Cleanup integration specs
(will delve into them later)