SC-66 Migrate from assertEquals to assertThat