diff --git a/tests/dia/bus/3546.oud2 b/tests/dia/bus/3546.oud2
new file mode 100644
index 0000000000000000000000000000000000000000..4997b552e3a50d48e53b4d341a20f79b40455a4d
--- /dev/null
+++ b/tests/dia/bus/3546.oud2
@@ -0,0 +1,263 @@
+FileType=OuDiaSecond.1.13
+Rosen.
+Rosenmei=公営バス3546系統
+KudariDiaAlias=大秋方面
+NoboriDiaAlias=古瀬方面
+Eki.
+Ekimei=古瀬駅
+Ekijikokukeisiki=Jikokukeisiki_NoboriChaku
+Ekikibo=Ekikibo_Ippan
+DownMain=0
+UpMain=1
+EkiTrack2Cont.
+EkiTrack2.
+TrackName=1番線
+TrackRyakusyou=1
+.
+EkiTrack2.
+TrackName=2番線
+TrackRyakusyou=2
+.
+.
+JikokuhyouJikokuDisplayKudari=0,1
+JikokuhyouJikokuDisplayNobori=1,0
+JikokuhyouSyubetsuChangeDisplayKudari=0,0,0,0,1
+JikokuhyouSyubetsuChangeDisplayNobori=0,0,0,0,1
+DiagramColorNextEki=0
+JikokuhyouOuterDisplayKudari=0,0
+JikokuhyouOuterDisplayNobori=0,0
+.
+Eki.
+Ekimei=五十嵐
+Ekijikokukeisiki=Jikokukeisiki_Hatsu
+Ekikibo=Ekikibo_Ippan
+DownMain=0
+UpMain=1
+EkiTrack2Cont.
+EkiTrack2.
+TrackName=1番線
+TrackRyakusyou=1
+.
+EkiTrack2.
+TrackName=2番線
+TrackRyakusyou=2
+.
+.
+JikokuhyouTrackOmit=1
+JikokuhyouJikokuDisplayKudari=0,1
+JikokuhyouJikokuDisplayNobori=0,1
+JikokuhyouSyubetsuChangeDisplayKudari=0,0,0,0,1
+JikokuhyouSyubetsuChangeDisplayNobori=0,0,0,0,1
+DiagramColorNextEki=0
+JikokuhyouOuterDisplayKudari=0,0
+JikokuhyouOuterDisplayNobori=0,0
+.
+Eki.
+Ekimei=中馬主来
+Ekijikokukeisiki=Jikokukeisiki_Hatsu
+Ekikibo=Ekikibo_Ippan
+DownMain=0
+UpMain=1
+EkiTrack2Cont.
+EkiTrack2.
+TrackName=1番線
+TrackRyakusyou=1
+.
+EkiTrack2.
+TrackName=2番線
+TrackRyakusyou=2
+.
+.
+JikokuhyouTrackOmit=1
+JikokuhyouJikokuDisplayKudari=0,1
+JikokuhyouJikokuDisplayNobori=0,1
+JikokuhyouSyubetsuChangeDisplayKudari=0,0,0,0,1
+JikokuhyouSyubetsuChangeDisplayNobori=0,0,0,0,1
+DiagramColorNextEki=0
+JikokuhyouOuterDisplayKudari=0,0
+JikokuhyouOuterDisplayNobori=0,0
+.
+Eki.
+Ekimei=大秋集会場
+Ekijikokukeisiki=Jikokukeisiki_Hatsu
+Ekikibo=Ekikibo_Ippan
+DownMain=0
+UpMain=1
+EkiTrack2Cont.
+EkiTrack2.
+TrackName=1番線
+TrackRyakusyou=1
+.
+EkiTrack2.
+TrackName=2番線
+TrackRyakusyou=2
+.
+.
+JikokuhyouTrackOmit=1
+JikokuhyouJikokuDisplayKudari=0,1
+JikokuhyouJikokuDisplayNobori=0,1
+JikokuhyouSyubetsuChangeDisplayKudari=0,0,0,0,1
+JikokuhyouSyubetsuChangeDisplayNobori=0,0,0,0,1
+DiagramColorNextEki=0
+JikokuhyouOuterDisplayKudari=0,0
+JikokuhyouOuterDisplayNobori=0,0
+.
+Eki.
+Ekimei=上馬主来
+Ekijikokukeisiki=Jikokukeisiki_KudariChaku
+Ekikibo=Ekikibo_Ippan
+DownMain=0
+UpMain=1
+EkiTrack2Cont.
+EkiTrack2.
+TrackName=1番線
+TrackRyakusyou=1
+.
+EkiTrack2.
+TrackName=2番線
+TrackRyakusyou=2
+.
+.
+JikokuhyouJikokuDisplayKudari=1,0
+JikokuhyouJikokuDisplayNobori=0,1
+JikokuhyouSyubetsuChangeDisplayKudari=0,0,0,0,1
+JikokuhyouSyubetsuChangeDisplayNobori=0,0,0,0,1
+DiagramColorNextEki=0
+JikokuhyouOuterDisplayKudari=0,0
+JikokuhyouOuterDisplayNobori=0,0
+.
+Ressyasyubetsu.
+Syubetsumei=普通
+JikokuhyouMojiColor=00000000
+JikokuhyouFontIndex=0
+JikokuhyouBackColor=00FFFFFF
+DiagramSenColor=00000000
+DiagramSenStyle=SenStyle_Jissen
+StopMarkDrawType=EStopMarkDrawType_DrawOnStop
+.
+Dia.
+DiaName=平日
+MainBackColorIndex=0
+SubBackColorIndex=1
+BackPatternIndex=0
+Kudari.
+Ressya.
+Houkou=Kudari
+Syubetsu=0
+EkiJikoku=1;700$0,1;704$0,1;705$0,1;709$0,1;711/$0
+Operation0B=5/$
+Operation4A=5/$0
+.
+Ressya.
+Houkou=Kudari
+Syubetsu=0
+EkiJikoku=1;1858$0,1;1902$0,1;1903$0,1;1907$0,1;1909/$0
+Operation0B=5/$
+Operation4A=5/$0
+.
+Ressya.
+Houkou=Kudari
+Syubetsu=0
+EkiJikoku=1;1958$0,1;2002$0,1;2003$0,1;2007$0,1;2009/$0
+Operation0B=5/$
+Operation4A=5/$0
+.
+.
+Nobori.
+Ressya.
+Houkou=Nobori
+Syubetsu=0
+EkiJikoku=1;641$1,1;642$1,1;646$1,1;647$1,1;652/$1
+Operation0B=5/$
+Operation4A=5/$0
+.
+Ressya.
+Houkou=Nobori
+Syubetsu=0
+EkiJikoku=1;738$1,1;739$1,1;743$1,1;744$1,1;749/$1
+Operation0B=5/$
+Operation4A=5/$0
+.
+.
+.
+KitenJikoku=000
+DiagramDgrYZahyouKyoriDefault=60
+OperationCrossKitenJikoku=1
+Comment=
+.
+DispProp.
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI;Bold=1
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI;Itaric=1
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI;Bold=1;Itaric=1
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI
+JikokuhyouFont=PointTextHeight=9;Facename=Meiryo UI
+JikokuhyouVFont=PointTextHeight=9;Facename=@メイリオ
+DiaEkimeiFont=PointTextHeight=9;Facename=Meiryo UI
+DiaJikokuFont=PointTextHeight=9;Facename=Meiryo UI
+DiaRessyaFont=PointTextHeight=9;Facename=Meiryo UI
+OperationTableFont=PointTextHeight=9;Facename=Meiryo UI
+AllOperationTableJikokuFont=PointTextHeight=8;Facename=Meiryo UI
+CommentFont=PointTextHeight=9;Facename=Meiryo UI
+DiaMojiColor=00000000
+DiaBackColor=00FFFFFF
+DiaBackColor=00FFFFFF
+DiaBackColor=00FFFFFF
+DiaBackColor=00FFFFFF
+DiaBackColor=00FFFFFF
+DiaRessyaColor=00000000
+DiaJikuColor=00C0C0C0
+JikokuhyouBackColor=00FFFFFF
+JikokuhyouBackColor=00F0F0F0
+JikokuhyouBackColor=00FFFFFF
+JikokuhyouBackColor=00FFFFFF
+StdOpeTimeLowerColor=00E0E0FF
+StdOpeTimeHigherColor=00FFFFE0
+StdOpeTimeUndefColor=0080FFFF
+StdOpeTimeIllegalColor=00A0A0A0
+OperationStringColor=00000000
+OperationGridColor=00000000
+EkimeiLength=6
+JikokuhyouRessyaWidth=5
+AnySecondIncDec1=5
+AnySecondIncDec2=15
+DisplayRessyamei=1
+DisplayOuterTerminalEkimeiOriginSide=0
+DisplayOuterTerminalEkimeiTerminalSide=0
+DiagramDisplayOuterTerminal=0
+SecondRoundChaku=0
+SecondRoundHatsu=0
+Display2400=0
+OperationNumberRows=1
+DisplayInOutLinkCode=0
+.
+WindowPlacement.
+RosenViewWidth=236
+ChildWindow.
+WindowType=2
+DiaIndex=0
+XPos=128
+YPos=128
+XSize=990
+YSize=423
+.
+ChildWindow.
+WindowType=1
+DiaIndex=0
+XPos=96
+YPos=96
+XSize=990
+YSize=423
+.
+ChildWindow.
+WindowType=0
+DiaIndex=0
+XPos=64
+YPos=64
+XSize=986
+YSize=419
+.
+.
+FileTypeAppComment=OuDiaSecondV2 Ver. 2.06.05
diff --git a/tests/dia/konpoku.oud2 b/tests/dia/train/konpoku.oud2
similarity index 100%
rename from tests/dia/konpoku.oud2
rename to tests/dia/train/konpoku.oud2
diff --git a/tests/dia/kyogoku.oud2 b/tests/dia/train/kyogoku.oud2
similarity index 100%
rename from tests/dia/kyogoku.oud2
rename to tests/dia/train/kyogoku.oud2
diff --git a/tests/dia/nayoro.oud2 b/tests/dia/train/nayoro.oud2
similarity index 100%
rename from tests/dia/nayoro.oud2
rename to tests/dia/train/nayoro.oud2
diff --git a/tests/dia/sekihoku1.oud2 b/tests/dia/train/sekihoku1.oud2
similarity index 100%
rename from tests/dia/sekihoku1.oud2
rename to tests/dia/train/sekihoku1.oud2
diff --git a/tests/dia/senmo.oud2 b/tests/dia/train/senmo.oud2
similarity index 100%
rename from tests/dia/senmo.oud2
rename to tests/dia/train/senmo.oud2
diff --git a/tests/dia/sibetu.oud2 b/tests/dia/train/sibetu.oud2
similarity index 100%
rename from tests/dia/sibetu.oud2
rename to tests/dia/train/sibetu.oud2
diff --git a/tests/dia/tomiuchi.oud2 b/tests/dia/train/tomiuchi.oud2
similarity index 100%
rename from tests/dia/tomiuchi.oud2
rename to tests/dia/train/tomiuchi.oud2
diff --git a/tests/dia/yumo.oud2 b/tests/dia/train/yumo.oud2
similarity index 100%
rename from tests/dia/yumo.oud2
rename to tests/dia/train/yumo.oud2