Added tests for ImageUploadHandler class
Merge branch 'development'