refactor of test suite