Adding few changes required in the test files.