Added a test for entity fix