DAM-270: Updating fixtures and tests