Refactored code
Added rest assured test cases
Refactored