Fix a refactoring bug
Testsuite refactoring