minor test fixes. Much more to do!