Make tests pass in Python 2 adding entities module