Fix test some more