shashank, sandesh | refactoring automation tests