intend real implementations to work, and beefed up the tests
to match.  The collaboration also got a little simpler.