Fixed most of the tests, still a couple broken