Cleanup IEntityManagerHelper and related stuff

This is a high risk cleanup, so, I have also started a full run of tests.