Tries to enhances tests on CF