Fix test + cleanup