start refactoring of test suite