Adding CKFileName and tests