Included the tests in the npm package
Restructured the tests