Fixes tests hangups