Unit test failure fixes
Merge pull request #70 from dpradeep/fixApiTests

Unit test failure fixes