Lokesh|Functional Test Refactoring