#369 Fixed with unit test.

Please, review.
we're using `MatcherAssert` from Hamcrest, please follow this convention