Update Images tests to fix merge issues

Fixed WIP merge issues:
-Fixed PEP8 issues with imports
-Fixed failing tests due to incorrect method name
-Added skipif tags based on specific config toggles
-Fixed failing tests due to improper class inheritance
-Added setup classes for certain tests
-Updated test steps
-Updated skipit tags with skipunless tags

Change-Id: Ib93ae6633bc79acfc9a59cd0619b38876d3809b3
Merge "Update Images tests to fix merge issues"