Updates the entities and adds a simple test
Updates the entities and adds a simple test