Fix async errors in user model tests.

Occasionally things will happen "out of order" unless we explicitly wait for them.

This fixes #182 and a couple of other possible async problems I noticed.