more test fixes. two still failing.