Fixed compile error with new tests.

Since JUnit was upped to 4.X, I switched to having JUnit validate the expected exception instead of the old try/catch verify method.
I wasn't sure if we were supposed to update this (or if it just gets batch updated at the release) but I saw someone else update it earlier so I added in the changes I made for this issue and the previous one I did around the normalizing.