Fixing up path resolution and catching regression
Repaired regression for cwd