refactor acceptance test suite.