Minor refactor to Future--trying to lock down an intermittently failing test.