[Master]:- Code Update & Test Cases