Refactoring
Assertions refactoring with custom assertThat
FestAssert integration and refactoring on comparator