Further improvement - added assertj fluent assertions.