Fixes #227 Tests are hanging