- Minor update to Entity
- Addition of stub for test