Some refactoring
Add another utility for the chinese test
Need underscores