Updated paths and replaced strstr to attempt to fix hhvm tests