More test fixes.
Tests marked "empty" will hang, presumably because of the synchronous
nature of those tests.