Updated test to support hhvm