modifications to add and correct failing tests. include a rawPreview when a preview property is not provided.