Manjyot, Lokesh| Removing util files from functional-tests and service-tests modules which are there in test-core module and some code refracting