work on fixing tests for bug 808370