Merge pull request #1402 from toopay/test-suite

Continuation of Unit-Testing