Remove Entity framework requirement
Update tests to reflect pluralization change
Removing reference for Entity.