diff --git a/test/roms/bankswitching/0840/0840_EconoBanking.bin b/test/roms/bankswitching/0840/0840_EconoBanking.bin
new file mode 100644
index 000000000..45dbbb187
Binary files /dev/null and b/test/roms/bankswitching/0840/0840_EconoBanking.bin differ
diff --git a/test/roms/bankswitching/0840/Untitled.bin b/test/roms/bankswitching/0840/Toyshop Trouble (0840) (2008) (John Payson, Zach Matley, Bob Montgomery, Thomas Jentzsch, Nathan Strum).bin
similarity index 100%
rename from test/roms/bankswitching/0840/Untitled.bin
rename to test/roms/bankswitching/0840/Toyshop Trouble (0840) (2008) (John Payson, Zach Matley, Bob Montgomery, Thomas Jentzsch, Nathan Strum).bin
diff --git a/test/roms/bankswitching/AR/Dragonstomper (1982) (Starpath).bin b/test/roms/bankswitching/AR/Dragonstomper (1982) (Starpath).bin
new file mode 100644
index 000000000..560fd7bf5
Binary files /dev/null and b/test/roms/bankswitching/AR/Dragonstomper (1982) (Starpath).bin differ
diff --git a/test/roms/bankswitching/AR/Escape from the Mindmaster (1982) (Arcadia).bin b/test/roms/bankswitching/AR/Escape from the Mindmaster (1982) (Arcadia).bin
new file mode 100644
index 000000000..035dff529
Binary files /dev/null and b/test/roms/bankswitching/AR/Escape from the Mindmaster (1982) (Arcadia).bin differ
diff --git a/test/roms/bankswitching/AR/Official Frogger, The (1983) (Starpath).bin b/test/roms/bankswitching/AR/Official Frogger, The (1983) (Starpath).bin
new file mode 100644
index 000000000..f074f9420
Binary files /dev/null and b/test/roms/bankswitching/AR/Official Frogger, The (1983) (Starpath).bin differ
diff --git a/test/roms/bankswitching/AR/Party Mix (1983) (Arcadia).bin b/test/roms/bankswitching/AR/Party Mix (1983) (Arcadia).bin
new file mode 100644
index 000000000..7a05916ac
Binary files /dev/null and b/test/roms/bankswitching/AR/Party Mix (1983) (Arcadia).bin differ
diff --git a/test/roms/bankswitching/AR/Phaser Patrol (1982) (Arcadia).bin b/test/roms/bankswitching/AR/Phaser Patrol (1982) (Arcadia).bin
new file mode 100644
index 000000000..d6c5d5c4d
Binary files /dev/null and b/test/roms/bankswitching/AR/Phaser Patrol (1982) (Arcadia).bin differ
diff --git a/test/roms/bankswitching/CM/CompuMate (1983) (Spectravideo).bin b/test/roms/bankswitching/CM/CompuMate (1983) (Spectravideo).bin
new file mode 100644
index 000000000..564751370
Binary files /dev/null and b/test/roms/bankswitching/CM/CompuMate (1983) (Spectravideo).bin differ
diff --git a/test/roms/bankswitching/DPC+/Space Rocks (2012-11-29) (NTSC) (Encore).bin b/test/roms/bankswitching/DPC+/Space Rocks (2012-11-29) (NTSC) (Encore).bin
new file mode 100644
index 000000000..6a71c28d8
Binary files /dev/null and b/test/roms/bankswitching/DPC+/Space Rocks (2012-11-29) (NTSC) (Encore).bin differ
diff --git a/test/roms/bankswitching/DPC/Pitfall! (1982) (Activision).bin b/test/roms/bankswitching/DPC/Pitfall! (1982) (Activision).bin
new file mode 100644
index 000000000..3a667676a
Binary files /dev/null and b/test/roms/bankswitching/DPC/Pitfall! (1982) (Activision).bin differ
diff --git a/test/roms/bankswitching/E0/James Bond 007 (1983) (Parker Bros) [b1].a26 b/test/roms/bankswitching/E0/James Bond 007 (1983) (Parker Bros) [b1].a26
deleted file mode 100644
index e6a845bb7..000000000
Binary files a/test/roms/bankswitching/E0/James Bond 007 (1983) (Parker Bros) [b1].a26 and /dev/null differ
diff --git a/test/roms/bankswitching/E0/Q-bert's Qubes (1983) (Parker Bros).a26 b/test/roms/bankswitching/E0/bad/Q-bert's Qubes (1983) (Parker Bros).a26
similarity index 100%
rename from test/roms/bankswitching/E0/Q-bert's Qubes (1983) (Parker Bros).a26
rename to test/roms/bankswitching/E0/bad/Q-bert's Qubes (1983) (Parker Bros).a26
diff --git a/test/roms/bankswitching/E0/Star Wars - The Arcade Game (Parker Bros) (Prototype 122283).a26 b/test/roms/bankswitching/E0/bad/Star Wars - The Arcade Game (Parker Bros) (Prototype 122283).a26
similarity index 100%
rename from test/roms/bankswitching/E0/Star Wars - The Arcade Game (Parker Bros) (Prototype 122283).a26
rename to test/roms/bankswitching/E0/bad/Star Wars - The Arcade Game (Parker Bros) (Prototype 122283).a26
diff --git a/test/roms/bankswitching/E0/Super Cobra (1982) (Parker Bros) [b1].a26 b/test/roms/bankswitching/E0/bad/Super Cobra (1982) (Parker Bros) [b1].a26
similarity index 100%
rename from test/roms/bankswitching/E0/Super Cobra (1982) (Parker Bros) [b1].a26
rename to test/roms/bankswitching/E0/bad/Super Cobra (1982) (Parker Bros) [b1].a26
diff --git a/test/roms/bankswitching/E7/Bump 'N' Jump (1983) (Mattel) [b1].a26 b/test/roms/bankswitching/E7/bad/Bump 'N' Jump (1983) (Mattel) [b1].a26
similarity index 100%
rename from test/roms/bankswitching/E7/Bump 'N' Jump (1983) (Mattel) [b1].a26
rename to test/roms/bankswitching/E7/bad/Bump 'N' Jump (1983) (Mattel) [b1].a26
diff --git a/test/roms/bankswitching/F0/F0_MegaBoy.bin b/test/roms/bankswitching/F0/F0_MegaBoy.bin
new file mode 100644
index 000000000..d4ec07408
Binary files /dev/null and b/test/roms/bankswitching/F0/F0_MegaBoy.bin differ
diff --git a/test/roms/bankswitching/F0/MegaBoy (Dynacom).bin b/test/roms/bankswitching/F0/MegaBoy (Dynacom).bin
new file mode 100644
index 000000000..5dcf295cf
Binary files /dev/null and b/test/roms/bankswitching/F0/MegaBoy (Dynacom).bin differ
diff --git a/test/roms/bankswitching/F6/Acid Drop (NTSC Conversion) (TJ).a26 b/test/roms/bankswitching/F6/Acid Drop (NTSC Conversion) (TJ).a26
deleted file mode 100644
index 1c27745bc..000000000
Binary files a/test/roms/bankswitching/F6/Acid Drop (NTSC Conversion) (TJ).a26 and /dev/null differ
diff --git a/test/roms/bankswitching/F8/H.E.R.O. (1984) (Activision) [o1].a26 b/test/roms/bankswitching/F6/H.E.R.O. (1984) (Activision) [o1].a26
similarity index 100%
rename from test/roms/bankswitching/F8/H.E.R.O. (1984) (Activision) [o1].a26
rename to test/roms/bankswitching/F6/H.E.R.O. (1984) (Activision) [o1].a26
diff --git a/test/roms/bankswitching/F6/Acid Drop (1992) (Salu) (PAL) [b1].a26 b/test/roms/bankswitching/F6/bad/Acid Drop (1992) (Salu) (PAL) [b1].a26
similarity index 100%
rename from test/roms/bankswitching/F6/Acid Drop (1992) (Salu) (PAL) [b1].a26
rename to test/roms/bankswitching/F6/bad/Acid Drop (1992) (Salu) (PAL) [b1].a26
diff --git a/test/roms/bankswitching/F8/H.E.R.O. (1984) (Activision) [a1].a26 b/test/roms/bankswitching/F8/H.E.R.O. (1984) (Activision) [a1].a26
deleted file mode 100644
index 323d938e3..000000000
Binary files a/test/roms/bankswitching/F8/H.E.R.O. (1984) (Activision) [a1].a26 and /dev/null differ
diff --git a/test/roms/bankswitching/F8SC/Defender II (1984) (Atari) [b1].a26 b/test/roms/bankswitching/F8SC/Defender II (1984) (Atari) [b1].a26
deleted file mode 100644
index 8f9b713c6..000000000
Binary files a/test/roms/bankswitching/F8SC/Defender II (1984) (Atari) [b1].a26 and /dev/null differ
diff --git a/test/roms/bankswitching/F8SC/Stargate (1984) (Atari) [o1].a26 b/test/roms/bankswitching/F8SC/Stargate (1984) (Atari) [o1].a26
deleted file mode 100644
index 2d2b1d836..000000000
Binary files a/test/roms/bankswitching/F8SC/Stargate (1984) (Atari) [o1].a26 and /dev/null differ
diff --git a/test/roms/bankswitching/FC/Power Play Arcade Video Game Album, The - Ghost Attack, Genesis, Havoc (1983) (Amiga) (1110) (Prototype).bin b/test/roms/bankswitching/FC/Power Play Arcade Video Game Album, The - Ghost Attack, Genesis, Havoc (1983) (Amiga) (1110) (Prototype).bin
new file mode 100644
index 000000000..8f40df7e7
Binary files /dev/null and b/test/roms/bankswitching/FC/Power Play Arcade Video Game Album, The - Ghost Attack, Genesis, Havoc (1983) (Amiga) (1110) (Prototype).bin differ
diff --git a/test/roms/bankswitching/FE/Decathlon (1983) (Activision) (PAL) [b1].a26 b/test/roms/bankswitching/FE/bad/Decathlon (1983) (Activision) (PAL) [b1].a26
similarity index 100%
rename from test/roms/bankswitching/FE/Decathlon (1983) (Activision) (PAL) [b1].a26
rename to test/roms/bankswitching/FE/bad/Decathlon (1983) (Activision) (PAL) [b1].a26
diff --git a/test/roms/bankswitching/FE/Robot Tank (1983) (Activision) (PAL) [b1].a26 b/test/roms/bankswitching/FE/bad/Robot Tank (1983) (Activision) (PAL) [b1].a26
similarity index 100%
rename from test/roms/bankswitching/FE/Robot Tank (1983) (Activision) (PAL) [b1].a26
rename to test/roms/bankswitching/FE/bad/Robot Tank (1983) (Activision) (PAL) [b1].a26
diff --git a/test/roms/bankswitching/Sub2K/Harte32.bin b/test/roms/bankswitching/Sub2K/Harte32.bin
new file mode 100644
index 000000000..4c7dce8c0
Binary files /dev/null and b/test/roms/bankswitching/Sub2K/Harte32.bin differ
diff --git a/test/roms/bankswitching/UA/Gingerbread Man SEGA-controller.ua.bin b/test/roms/bankswitching/UA/Gingerbread Man SEGA-controller.ua.bin
new file mode 100644
index 000000000..aa869c4b9
Binary files /dev/null and b/test/roms/bankswitching/UA/Gingerbread Man SEGA-controller.ua.bin differ
diff --git a/test/roms/bankswitching/X07/x07.bin b/test/roms/bankswitching/X07/x07.bin
new file mode 100644
index 000000000..2bccd1618
Binary files /dev/null and b/test/roms/bankswitching/X07/x07.bin differ