Merge pull request #1161 from toopay/unit-tests

Unit Tests marked as "Incomplete" now completed.