Attempting to fix the two failing tests.