Additional REST API tests, few code cleanups along the way
Merge pull request #158 from smarthi/suneel

Additional REST API tests, few code cleanups along the way