Split Builder and Entity logic
Remove PhpUnit process isolation since it does not work wekk with phpunit/hhvm duo