Fixing two failing tests