Update promises and tests