vrao/mshah: test failure fixes.