fixed test
merge conflict in current image test