Updated test output.
Merge branch 'master' into nonpackage-scripts