First round of test fixes
Replace CS0 with CS1
Merge pull request #294 from bhariharan/unstable20

First round of test fixes