BS-7456, use assertions from assertJ rather than hamcrest