Fix test
Add a ton of tests