Merge pull request #139 from danmcp/master

add integration and cmd testing