WyC: refactoring the test suites.