CHANGED: replaced remaining assertTrue by assertThat