More test_promise fixes.