Making Test Parameters configurable & Code Refactoring