Fix last two failing tests