Added waiting for Promise (no test to reflect it though)