Util: refactored Promise model to Core module.
Test: updated code to match refactored Promise model.