Migrate deprecated assertThat()