fixed two more failing tests