refactor test suite