Cleaning up the tests

The tests are now a bit smaller and cleaner which is always nice.
Upgrading dependencies

I wish npm had a better command for this.