Rewriting test suite