Finish adding promise handling to spot tests.