Fix not returning the Promise from map(), was probably causing tests to fail intermittently