Fixed repair path regular expression
Updated phpunit tests