Improve some tests
Merge pull request #263 from my-personal-forks/fix-path-tests

Improve some tests