Uncomment some tests, fix some other stuff.