Merge pull request #18 from tjragan/master

Complex mode integration test and more bug fixes
Changed docstring on two tests