simplify running old version of intergration tests
fix old style integration tests