More test fixes. (wip)