Merge "Update the test output path." into jb-mr2-dev