Fix two tests