Fix test remanents