Add UnitTest
Work to solving issue #1