Merge "Test case fixes." into jb-dev