Migration to Assertj