Cleaned up test with Awaitility

Kind of a cool thing for what we're doing. Might go
back and clean up some of the other tests with it.