more work for bug 843004. tests should be done