Fixed tests after refactoring IEntityConverter interface