Revert "of course composer.lock has to be added too"

This reverts commit 186c9be20c9e17857af4e734d9eb4e4c5adc1748.
Revert "allow failures for hhvm"

This reverts commit 90b11428445192867e1506c8896e8b94c3cff852.
fix hhvm tests, as hhvm is faster than file deleting (i guess)