Un-borking stale checkin tests and such