CMS-1819 Convert content_find to use value objects

- Updated test according to JVS comments in task