unit testy goodness, and package.json fixed