add new fields, update tests, add new helper for images