Fix test problems.