#6484: refactor a bit the tests.
1 file changed