Added tests for cf mapping