Update clientserver tests to assertj