Images fixture refactor

* updated the fixture to use composites

Change-Id: I4a326b6d3d8528c4dec097bac206054962e1e200