Improve the test suite

Use the right files and the right codes.
1 file changed