Merge "Making the test fail more gracefully." into jb-dev