Switch to promise-returning test style, match code style