diff --git a/tests/MasterEditorTWL_mrc_roms/original_rom/Card/Makefile b/tests/MasterEditorTWL_mrc_roms/original_rom/Card/Makefile
index d877b54..2af5ed6 100644
--- a/tests/MasterEditorTWL_mrc_roms/original_rom/Card/Makefile
+++ b/tests/MasterEditorTWL_mrc_roms/original_rom/Card/Makefile
@@ -21,7 +21,7 @@ TARGET_PLATFORM := TWL
 SUBDIRS		= 	../common/banner \
 				$(ROOT)/build/demos/gx/UnitTours/DEMOLib
 
-TARGET_BIN	= CardRomHeaderChecker.srl
+TARGET_BIN	= regular_card.srl
 #INCDIR		= ../common/include
 SRCDIR		= ../common/src
 SRCS		= main.c
diff --git a/tests/MasterEditorTWL_mrc_roms/original_rom/Makefile b/tests/MasterEditorTWL_mrc_roms/original_rom/Makefile
index d5d8dc2..3c3366e 100644
--- a/tests/MasterEditorTWL_mrc_roms/original_rom/Makefile
+++ b/tests/MasterEditorTWL_mrc_roms/original_rom/Makefile
@@ -22,7 +22,8 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 #----------------------------------------------------------------------------
 
 SUBDIRS		=	Card	\
-				Nand
+				Nand	\
+				System  
 
 #----------------------------------------------------------------------------
 
diff --git a/tests/MasterEditorTWL_mrc_roms/original_rom/Nand/Makefile b/tests/MasterEditorTWL_mrc_roms/original_rom/Nand/Makefile
index dd80640..acf5c2b 100644
--- a/tests/MasterEditorTWL_mrc_roms/original_rom/Nand/Makefile
+++ b/tests/MasterEditorTWL_mrc_roms/original_rom/Nand/Makefile
@@ -23,7 +23,7 @@ TWL_ARCHGEN		:= LIMITED
 SUBDIRS		= 	../common/banner \
 				$(ROOT)/build/demos/gx/UnitTours/DEMOLib
 
-TARGET_BIN	= CardRomHeaderChecker.tad
+TARGET_BIN	= regular_nand.tad
 #INCDIR		= ../common/include
 SRCDIR		= ../common/src
 SRCS		= main.c
diff --git a/tests/MasterEditorTWL_mrc_roms/original_rom/System/Makefile b/tests/MasterEditorTWL_mrc_roms/original_rom/System/Makefile
new file mode 100644
index 0000000..38b0ff7
--- /dev/null
+++ b/tests/MasterEditorTWL_mrc_roms/original_rom/System/Makefile
@@ -0,0 +1,56 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - tests - appjumpTest - Card
+# File:     Makefile
+#
+# Copyright 2008 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
+TARGET_PLATFORM := TWL
+TWL_NANDAPP		:= TRUE
+TWL_ARCHGEN		:= LIMITED
+
+SUBDIRS		= 	../common/banner \
+				$(ROOT)/build/demos/gx/UnitTours/DEMOLib
+
+TARGET_BIN	= regular_sys.tad
+#INCDIR		= ../common/include
+SRCDIR		= ../common/src
+SRCS		= main.c
+
+ROM_SPEC	=	./ROM-TS_nand.rsf
+
+#----------------------------------------------------------------------------
+
+include $(TWLSDK_ROOT)/build/buildtools/commondefs
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
+
+# インストール指定
+#ifneq	($(TWL_IPL_RED_ROOT),)
+#INSTALL_DIR	= $(TWL_IPL_RED_ROOT)/debugsoft/CardRomHeaderChecker
+#INSTALL_TARGETS	= $(BINDIR)/$(TARGET_BIN)
+#endif
+MAKEROM				=	$(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe
+MAKETAD_OPTION		=	-s
+
+#TWL_LIBS_EX		+=	libtcl$(TWL_LIBSUFFIX).a
+
+do-build:	$(TARGETS)
+
+#----------------------------------------------------------------------------
+
+LIBSYSCALL			 = ../common/0CZA/libsyscall.a
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+#===== End of Makefile =====
diff --git a/tests/MasterEditorTWL_mrc_roms/original_rom/System/ROM-TS_nand.rsf b/tests/MasterEditorTWL_mrc_roms/original_rom/System/ROM-TS_nand.rsf
new file mode 100644
index 0000000..c95e078
--- /dev/null
+++ b/tests/MasterEditorTWL_mrc_roms/original_rom/System/ROM-TS_nand.rsf
@@ -0,0 +1,255 @@
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - include
+# File:     ROM-TS.rsf
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded insructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+#
+#  TWL ROM SPEC FILE
+#
+
+Arm9
+{
+	Static			"$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)"
+	Elf				"$(MAKEROM_ARM9:r).tef"
+}
+
+Arm7
+{
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)"
+	Elf				"$(MAKEROM_ARM7_BASE:r).tef"
+}
+
+Arm9.Ltd
+{
+	Static			"$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayDefs		"$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)"
+	OverlayTable	"$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)"
+}
+
+Arm7.Ltd
+{
+	Static			"$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayDefs		"$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)"
+	OverlayTable	"$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)"
+}
+
+Property
+{
+	###
+	### Settings for FinalROM
+	###
+	#### BEGIN
+	#
+	# TITLE NAME: Your product name within 12bytes
+	#
+	TitleName		"SAMPLE GAME"
+
+	#
+	# MAKER CODE: Your company ID# in 2 ascii words
+	#             issued by NINTENDO
+	#
+	MakerCode		"00"
+
+	#
+	# REMASTER VERSION: Mastering version
+	#
+	#RomVersion		0
+
+	#
+	# ROM SPEED TYPE: [MROM/1TROM/UNDEFINED]
+	#
+	#RomSpeedType	$(MAKEROM_ROMSPEED)
+
+	#
+	# ROM SIZE: in bit [64M/128M/256M/512M/1G/2G/4G]
+	#
+	#RomSize		64M
+
+	#
+	# ROM PADDING: TRUE if finalrom
+	#
+	#RomFootPadding 	TRUE
+
+	#
+	# ROM HEADER TEMPLATE: Provided to every product by NINTENDO
+	#
+	RomHeaderTemplate	../common/0CZA/rom_header_0cza.template.sbin
+
+	#
+	# BANNER FILE: generated from Banner Spec File
+	#
+	BannerFile		../common/banner/banner.bnr
+
+	#
+	# Permit LandingNormalJump: for TWL "ApplicationJump" function [TRUE/FALSE]
+	#
+	#PermitLandingNormalJump	FALSE
+
+	#
+	# Permit LandingTmpJump: for TWL "ApplicationJump" function [TRUE/FALSE]
+	#
+	#PermitLandingTmpJump	FALSE
+
+	###
+	### Setting for TWL
+	###
+
+	#
+	# ROM HEADER Ltd: Provided to every product by NINTENDO
+	#
+	RomHeaderLtd	$(TWLSDK_ROOT)/tools/bin/rom_header.LTD.sbin
+
+	#
+	# Digest parameters:
+	#
+	DigestParam		1024 32
+
+	#
+	# WRAM mapping: [MAP_BB_HYB/MAP_BB_LTD/MAP_TS_HYB/MAP_TS_LTD
+	#                MAP2_BB_HYB/MAP2_BB_LTD/MAP2_TS_HYB/MAP2_TS_LTD]
+	#  don't have to edit
+	#
+	WramMapping		$(MAKEROM_WRAM_MAPPING)
+
+	#
+	# CardRegion: card region [Japan/America/Europe/Australia/China/Korea]
+	#
+	CardRegion	Japan
+
+	#
+	# Codec mode:
+	#  don't have to edit
+	#
+	CodecMode		$(MAKEROM_CODEC_MODE)
+
+	#
+	# Disp WiFiConnection Icon for Launcher  [TRUE/FALSE]
+	#
+	#WiFiConnectionIcon	FALSE
+
+	#
+	# Disp DSWireless Icon for Launcher  [TRUE/FALSE]
+	#
+	#DSWirelessIcon	FALSE
+
+	#
+	# Agree EULA [TRUE/FALSE]
+	#
+	#AgreeEULA	FALSE
+
+	#
+	# Agree EULA version [1 - 255]
+	#
+	#AgreeEULAVersion	1
+	
+	#SDCardAccess	TRUE
+	#JpegSign		TRUE
+	#PhotoAccess		Read
+
+	###
+	#### END
+}
+
+AppendProperty
+{
+	#
+	# Boot allowed Media: [GameCard]
+	#
+	Media					NAND
+
+	AppType					System
+	Launch					TRUE
+
+	#
+	# GameCode for TitleID : Your GameCode in 4 ascii words
+	#
+	#GameCode				ABCJ
+
+	#
+	# Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M]
+	#
+	PublicSaveDataSize		1M
+
+	#
+	# Private save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M]
+	#
+	PrivateSaveDataSize		2M
+
+	#
+	# Enable SubBannerFile
+	SubBannerFile			TRUE
+
+	#
+	# Game card power on: [TRUE/FALSE]
+	#
+	#GameCardOn				FALSE
+
+	#
+	# Game card transferd to nitro mode: [TRUE/FALSE]
+	#
+	#GameCardNitroMode		FALSE
+}
+
+RomSpec
+{
+	Offset		0x00000000
+	Segment		ALL
+	HostRoot	$(MAKEROM_ROMROOT)
+	Root		/
+	File		$(MAKEROM_ROMFILES)
+}
+
+Rating
+{
+	#
+	# Permited age to play for each rating organization
+	#
+	# Supported organization
+	# - CERO			(OGN0)	:	for Japan
+	# - ESRB			(OGN1)	:	for North America
+	# - BBFC			(OGN2)	:	obsolete organization
+	# - USK				(OGN3)	:	for German
+	# - PEGI_GEN		(OGN4)	:	for Europe
+	# - PEGI_FINLAND	(OGN5)	:	obsolete organization
+	# - PEGI_PRT		(OGN6)	:	for Portugal
+	# - PEGI_BBFC		(OGN7)	:	for UK
+	# - OFLC			(OGN8)	:	for Australia and NewZealand
+	# - GRB				(OGN9)	:	for Korea
+	# - OGN10					:	reserved
+	# - OGN11					:	reserved
+	# - OGN12					:	reserved
+	# - OGN13					:	reserved
+	# - OGN14					:	reserved
+	# - OGN15					:	reserved
+	#
+	# Available age [ 0 - 31 / PENDING / FREE ]
+
+	CERO		FREE
+#	ESRB		FREE
+#	USK			FREE
+#	PEGI_GEN	FREE
+#	PEGI_PRT	FREE
+#	PEGI_BBFC	FREE
+#	OFLC		FREE
+#	GRB			FREE
+
+	#
+	# Unnecessary rating: [TRUE/FALSE]
+	#
+	#Unnecessary TRUE
+}