wip: more test fixes; test3 and test4 tbd