Convert tests to return promises.

Move timeout to `setUp`