Throw out trash. Partly repair tests