Merge "Redirect test job output to directory"