fix integration test commenting and cleaning