Added image tests
Enhanced new tests