Resolved drive letter issue and fixed tests