Refactor test suite