Cleanup, make npm test work