Revert "WIP: make broken tests pass, yeah"

This reverts commit 8d5e11daa630536b073ac9a0e59a63526bf9944d.
Revert "chore(package.json): tidy up dependencies"

This reverts commit 40308e5935a3ad55542f6eea23b8a7e4fab3aadd.

Conflicts:
	package.json
WIP: fix again, but moreso this time