Bug 1054326: Initial attempt to submit Imagecompare test framework and test cases int...

...o the main branch
The above if statements are not likely to ever be true because both of these options have default values, so I think we should just remove them.