improved tests and Entity Pool