Added AssertJ and Tests