Merge branch 'jh/use-test-must-fail'