Test Fix

The previous commit made a code change that broke the tests.  This
change fixes those tests.