Fix up the test suite

Resolves #87. HHVM seems to be segfaulting. Investigating...