Improve Calc and Impress image tests based on auto swapping

Change-Id: I6a784a68cb1a1936196d35fc15af691d2aeb5773