[Sailee/Khushal]: Refactored Test