Fixes the test not to freeze on HHVM

This resolves #475
minor #491 Fixes the test not to freeze on HHVM (Nyholm)

This PR was merged into the 0.5.x-dev branch.

Discussion
----------

Fixes the test not to freeze on HHVM

This resolves #475

Commits
-------

a564c30 Fixes the test not to freeze on HHVM
fix docs