Repair tests and remove option parameter