Update clientserver tests to assertj

Also add Feature annotations and do some reformatting
Merge pull request #493 from zanata/update-to-assertj-clientserver

Update clientserver tests to assertj