changes related to use of BaseTestClass
changes in OptionalInputTest according to usage of BaseTestClass; small fixes
changes in NewRetryTest according to usage of BaseTestClass, small fix