updates, with retooling to track down remaining differences with original test code