Fix Remaining SDK Tests
Merge pull request #295 from bhariharan/unstable20

Fix Remaining SDK Tests