Merge "Add support for Promise test cases"