Fixing tests, I don't believe all of them were passing to start with