Fixed two failing tests