refactored path name and fixed test case failures