[Experimental] - Integration tests refactor

Had planned to fix this but was busy trying to get a successful build first ;)