Refactor image member(s) model and tests

- refactored the image member(s) model and tests to account for
  changes made in the image model refactoring.

Change-Id: I31786592acfceade5080eee4ad31b2a6d9aeb7cc
Merge "Refactor image member(s) model and tests"