Unit tests: cleaned up outdated / unused / commented out code.
Merge pull request #579 from BenMorel/cleanup

Unit tests: cleanup of outdated / unused / commented out code