Reverting "Just few small changes in the image test." Because there is pending pull request to imageTest and this changes might create conflicts.

This reverts commit 3675890c489deb3b633d944b5f77f5a9d62a8b4f.