Minor code improvements, and allow hhvm failure while phpunit does not support separate processes