Sigh, more amends to unit tests.