[Experimental] - Integration tests refactor

this looks unrelated to test refactor ?