CMS-2321 Let the Form from the ContentType be saved together with the Content
Fixed test data