Proper image diff handling

Not sure if image diff state check I'm doing is clever or hacky... :)
Function name change to fit it's purpose
Adding click test for sub diff