Use better path function
Update test for new syntax