Overlooked old import path
And fixed a test (related to f172c4e)
Merge branch 'master' into fd-extract-promise