Ensure that image and identity clients are constructed properly.

Also removed tests that don't test anything.

Change-Id: I0cb420248c8a1374110c014063fe029686e90216