Doctrine 2 - ORM

[GH-612] Fixed failing tests