Fixing test imports and behavior of HadoopPath.resolve