Convert to assertj and clean up Account tests