Introduce Promise chain for some tests.

Thinking the current tests are deep, and using Promise would be better. @lavelle, wdyt?