Use HasPrefix instead of Contains
Do not hide path var
Updated tests for linux