Added unit tests for issue #29