Get rid of some stale tests