PathMaker and Test updated