added new tests
modified to support regr run