Make the tests happy!

Also, while !! is ugly, convert the async param to always be a boolean
to be more intent revealing in tests.