Minor markup refinements.
Expand tests and test helpers.

Calls to Ember Testing async helpers can be
chained, while wait helper calls must be separate.