Fixing prepublish
Adding some tests