Tweak screenshot test output and allow global command line options to be overridden by individual test specs.