Continued re-synchronizing unit tests with code changes.