Make renaming files optional

Not sure if this was intended or not, but I would like the ability to keep baseline images within my repository and not have them be renamed each test run. Otherwise the issue that occurs is: 

1. I run the tests and get my baseline images.
2. I force a test failure. But my baseline images get renamed
3. I try to force a test failure again, but this time the test passes because the failed images are now being used as baseline images.

I know that it is preferred to keep baseline images on a separate repo and sync up/down when needed but at the moment that's not viable for my use case.