Removed redundant entries
Refactored test clients
Added more helper functions
Refactor
Added new test cases