REFACTOR Test suite