fixes for acceptance test runner