Cleanup, fix test breakage.