Fix for paths with hyphens and increase timeout