Add some assertj assertions structural replaces