A little cleanup, fix broken tests.