Added CFRSwap test, fixed op bug. CFRS incomplete!