Fixup. Use assertThat instead of assertEquals