additional function and test fixes bug 8295