Fix to hanging tests.