Dileep | Reducing unnecessary data setup in UT

test_entity.py run time 250 sec -> 11 sec (local)