Another round of test fixes
Merge pull request #672 from bhariharan/unstable

Another round of test fixes