Merge "Re-Enable Promise testcases"