Adding additional tests, hopefully without going overboard trying to
avoid callback hell.