Actually makes test wrap nicely within composite.

Refs #36