I suggest using static import on Assert.assertEquals(), but that can be done in a separate commit later (for the whole class)