More tests

If you're happy with changes do a `npm publish` please