Fixes tests, leaving 9 out bc i have no idea if they actually should pass, will investigate
Fixes makefile and package.json