more work for bug 843004. started work on patch 4, test fixes