Further unit test revisions.