Added improvements to test for image registry

Change-Id: Id5d7e1e14ca03600dea896a44ab9fe3985a0c5fa