Moved tests to EntityIdSuite
debugging.
commented out some debugging printlns
Blah