Fixed the tests, hopefully.