We should consider migrating from `@ExpectedException` to [AssertJ](http://joel-costigliola.github.io/assertj/assertj-core-features-highlight.html#exception-assertion). This will help if/when we upgrade to JUnit 5.