Ongoing refactoring of shouldThrow to use Hamcrest assertions