Use simple promise
Update testcase
Remove comment