Upgrade included dropping use of the now-deprecated ExpectedException in favor of AssertJ's assertions for thrown exceptions. Closes gh-863
Upgrade included dropping use of the now-deprecated ExpectedException in favor of AssertJ's assertions for thrown exceptions. Closes gh-863