Fixing issue #35

Adding some more unit test