Fix test breaks