Completed entities, add test cases for entities