Revert "Cleanup - Mended some broken test."

This reverts commit 9492bf449c29441de7443fd5e849c9713a2b89a5.
Merge pull request #139 from pmampe/cleanup

Revert "Cleanup - Mended some broken test."