style fixes and test fixes for bug 760876
work on tests for bug 760876
work on fixes for tests, bug 760876