Doctrine 2 - ORM

[GH-579] Unit tests: cleanup of outdated / unused / commented out code