Image Unit Tests

- refactored unit tests for the image model to account for
  changes made on the image model.

Change-Id: I1a3c8a6a79f08d8681f05354b8fe442f0f085ce1
Merge "Image Unit Tests"