Handle the differences in output better when specific tests are run (eg: -Dfrom=model)