[TASK] Refinement of Entities and tests to 100% coverage