drafts unit tests pass; reasonably comprehensive; live in compose test

@kgrandon @jrburke 

Looking for a fast review for landing today. :)  Will put up the revised gaia pull in a sec too.