Lokesh| FunctionalTest refactoring