Add AssertJ and fix broken unit test
Merge pull request #407 from zanata/use-assertj

Add AssertJ and fix broken unit test