Implement inclusion
Rearrange tests
Adjust package.json for npm test