Edited Entities and Added Listing tests