Merge pull request #98 from soupwizard/master

Fixed unittest failure, cleaned up unit test output