reworked acceptance test suite