Refactor Image Fixtures

*Refactored image fixtures to add admin user data to distinguish
 between user, alt_user and admin privileges
*Merged existing fixture changes
*Fixed order of imports
*Fixed line return for better readability

Change-Id: Id364d173c9e33367b5437e70a98a3b704e83ea5f
Merge "Refactor Image Fixtures"