Add test content (same as branch cfd-172)