Inline block defs for readability. . . add asynch test utils.
Merge branch 'master' of github.com:jasperblues/Typhoon