replaced isHhvm() by direct check for HHVM_VERSION
fix test cross compat