Improve use of assertj