Merge pull request #23 from nubs/master

Add a test for request-trade-in.
Replace the `then` functions with wait functions
Merge pull request #24 from guywithnose/removeThen

Replace the `then` functions with wait functions