Fixed two out of three counters tests.
Re added the CPEntityManager.
Revert "Fixed two out of three counters tests."

This reverts commit c18df540d878457911ed13a20a0dbec12b46106b.