Tests written
Merge branch 'pathCleanup'