Removed whitespace
Fixed a test
Changed how path resolution works