minor fixes after test execution on ha andn non ha labs in different configs