refactoring Entities object in preparation for optimization add unit tests for Entities class move escape and unescape methods into Entities class