Uses ExpectedException to test for exceptions

Hi, thanks for this great project! :)

I was browsing the code and noticed parts of this test suite could be simplified by using ExpectedException. (See [Junit's notes on exception testing](https://github.com/junit-team/junit/wiki/Exception-testing) for details.)

I also took the liberty to trim out some empty setup methods.