Update JUnit and switch to AssertJ.

@swankjesse