Better HHVM check
Unify keys when matching histories
Work on HHVM tests