HHVM is required to pass, minor fixes