git svn: rename tests that had conflicting numbers