update tests and some edge cases for HHVM