Fix cfx tests.