Fix tests.  All green now.