Fixing tests failing because of new scratch file name.
Fixing test - can specify just analyzer name if well known
Fixing tests