Test suite refactor