Switched from Fest to AssertJ
Merge branch 'assertJ'