Cleanup - Mended some broken test.
Merge pull request #137 from pmampe/cleanup

Cleanup - Mended some broken test.