Added unit test
Fix unit test failure
Merge pull request #1 from MSMFG/master

Added unit test