Merge pull request #19 from acoburn/TAMAYA-218

TAMAYA-218: Simplify AssertJ tests