Refactor some code on admin_cloud_image tests
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh