[Issue #236] Added unit test..