Fixing tests and other stuff.