replaced usage of UnittestSupport with IntegrationTestSupport