Merge pull request #294 from bhariharan/unstable20

First round of test fixes
Fix Remaining SDK Tests