Issue #197 - unit testing and new pattern proposition