diff --git a/.github/workflows/FEProject_build.yml b/.github/workflows/FEProject_build.yml
index e82a49ee..b7545d4c 100644
--- a/.github/workflows/FEProject_build.yml
+++ b/.github/workflows/FEProject_build.yml
@@ -64,6 +64,8 @@ jobs:
         make -j 2 -C FElib/src
 
     - name: unit test for common
+      env: 
+        testdirs: linkedlist time_manager sparsemat timeint_rk
       run: | 
         echo "Perform unit tests .."
 
@@ -71,12 +73,13 @@ jobs:
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/common
-        make -C linkedlist
-        make -C time_manager
-        make -C sparsemat
-        make -C timeint_rk
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
 
     - name: unit test for FE
+      env: 
+        testdirs: polynominal mesh_linedom1d mesh_rectdom2d_quadrilateral mesh_cubedsphere2d mesh_cubedom3d_hexahedral mesh_cubedsphere3d field_linedom1d field_rectdom2d_quadrilateral field_cubedspheredom2d field_cubedom3d_hexahedral field_cubedspheredom3d
       run: | 
         echo "Perform unit tests .."
 
@@ -84,19 +87,13 @@ jobs:
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/FE
-        make -C polynominal
-        make -C mesh_linedom1d
-        make -C mesh_rectdom2d_quadrilateral
-        make -C mesh_cubedsphere2d
-        make -C mesh_cubedom3d_hexahedral
-        make -C mesh_cubedsphere3d
-        make -C field_linedom1d
-        make -C field_rectdom2d_quadrilateral
-        make -C field_cubedspheredom2d
-        make -C field_cubedom3d_hexahedral
-        make -C field_cubedspheredom3d
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
     
-    - name: unit test for framework
+    - name: unit test for model framework
+      env: 
+        testdirs: model_framework
       run: | 
         echo "Perform unit tests .."
 
@@ -104,7 +101,9 @@ jobs:
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/framework
-        make -C model_framework
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
 
     - name: samples
       run: | 
diff --git a/COPYRIGHT b/COPYRIGHT
index b3305ebc..bb404e1f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2019--2024 FE-project Group. All rights reserved.
+Copyright (C) 2019--2025 FE-project Group. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -------------- Japanese Version start here --------------------------
 
-Copyright (C) 2019--2024 FE-project Group. All rights reserved.
+Copyright (C) 2019--2025 FE-project Group. All rights reserved.
 
 以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソ
 フトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱
diff --git a/FElib/test/FE/field_cubedom3d_hexahedral/Makefile b/FElib/test/FE/field_cubedom3d_hexahedral/Makefile
index 351cbda9..dce50bc7 100644
--- a/FElib/test/FE/field_cubedom3d_hexahedral/Makefile
+++ b/FElib/test/FE/field_cubedom3d_hexahedral/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedom3d_hexahedral
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/FE/field_cubedspheredom2d/Makefile b/FElib/test/FE/field_cubedspheredom2d/Makefile
index 194f37bd..08e6151d 100644
--- a/FElib/test/FE/field_cubedspheredom2d/Makefile
+++ b/FElib/test/FE/field_cubedspheredom2d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedspheredom2d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/FE/field_cubedspheredom3d/Makefile b/FElib/test/FE/field_cubedspheredom3d/Makefile
index e1881fe3..5958c510 100644
--- a/FElib/test/FE/field_cubedspheredom3d/Makefile
+++ b/FElib/test/FE/field_cubedspheredom3d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedspheredom3d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/field_linedom1d/Makefile b/FElib/test/FE/field_linedom1d/Makefile
index 6601e9a0..992f4139 100644
--- a/FElib/test/FE/field_linedom1d/Makefile
+++ b/FElib/test/FE/field_linedom1d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_linedom1d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/field_rectdom2d_quadrilateral/Makefile b/FElib/test/FE/field_rectdom2d_quadrilateral/Makefile
index 398b4f9e..26c29c20 100644
--- a/FElib/test/FE/field_rectdom2d_quadrilateral/Makefile
+++ b/FElib/test/FE/field_rectdom2d_quadrilateral/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_rectdom2d_quadrilateral
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/mesh_cubedom3d_hexahedral/Makefile b/FElib/test/FE/mesh_cubedom3d_hexahedral/Makefile
index fe41dd2a..6ff1fd3f 100644
--- a/FElib/test/FE/mesh_cubedom3d_hexahedral/Makefile
+++ b/FElib/test/FE/mesh_cubedom3d_hexahedral/Makefile
@@ -6,56 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_mesh_cubedom3d_hexahedral
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/mesh_cubedsphere2d/Makefile b/FElib/test/FE/mesh_cubedsphere2d/Makefile
index 5f3e85aa..9988715a 100644
--- a/FElib/test/FE/mesh_cubedsphere2d/Makefile
+++ b/FElib/test/FE/mesh_cubedsphere2d/Makefile
@@ -6,56 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_mesh_cubedsphere2d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/mesh_cubedsphere3d/Makefile b/FElib/test/FE/mesh_cubedsphere3d/Makefile
index 83f485e1..0e80a557 100644
--- a/FElib/test/FE/mesh_cubedsphere3d/Makefile
+++ b/FElib/test/FE/mesh_cubedsphere3d/Makefile
@@ -6,56 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_mesh_cubedsphere3d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/mesh_linedom1d/Makefile b/FElib/test/FE/mesh_linedom1d/Makefile
index 9af337eb..f5035431 100644
--- a/FElib/test/FE/mesh_linedom1d/Makefile
+++ b/FElib/test/FE/mesh_linedom1d/Makefile
@@ -6,56 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_mesh_linedom1d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS) 
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/mesh_rectdom2d_quadrilateral/Makefile b/FElib/test/FE/mesh_rectdom2d_quadrilateral/Makefile
index f47c2bfd..6ce83c08 100644
--- a/FElib/test/FE/mesh_rectdom2d_quadrilateral/Makefile
+++ b/FElib/test/FE/mesh_rectdom2d_quadrilateral/Makefile
@@ -6,56 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_mesh_rectdom2d_quadrilateral
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/polynominal/Makefile b/FElib/test/FE/polynominal/Makefile
index a8532e0e..c327caac 100644
--- a/FElib/test/FE/polynominal/Makefile
+++ b/FElib/test/FE/polynominal/Makefile
@@ -6,58 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_polynominal
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f legendre*.dat
-	rm -f lagrange*.dat
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/FE/profile_calperf/Makefile b/FElib/test/FE/profile_calperf/Makefile
index 3f5aea71..8fecbd21 100644
--- a/FElib/test/FE/profile_calperf/Makefile
+++ b/FElib/test/FE/profile_calperf/Makefile
@@ -6,55 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_profile_calperf
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 4 ./$(BINNAME)
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 4
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
\ No newline at end of file
diff --git a/FElib/test/Makefile.common b/FElib/test/Makefile.common
new file mode 100644
index 00000000..0759516a
--- /dev/null
+++ b/FElib/test/Makefile.common
@@ -0,0 +1,102 @@
+################################################################################
+#
+# Common Makefile for unit tests of FElib
+#
+################################################################################
+
+SYSDEP_DIR  = $(TOPDIR)/sysdep
+BUILD_DIR   = ./.libs
+BINDIR2     = .
+
+include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
+include $(TOPDIR)/Mkinclude
+
+LIBS = $(LIBDIR)/libScaleFECore.a
+
+ifeq ($(origin PPNAME), undefined)
+   PPNAME = NONE
+endif
+
+ifeq ($(origin INITNAME), undefined)
+   INITNAME = NONE
+endif
+
+ifeq ($(origin BINNAME), undefined)
+   BINNAME = NONE
+endif
+
+ifeq ($(origin PPCONF), undefined)
+   PPCONF = NONE
+endif
+
+ifeq ($(origin INITCONF), undefined)
+   INITCONF = NONE
+endif
+
+ifeq ($(origin RUNCONF), undefined)
+   RUNCONF = NONE
+endif
+
+all:
+	$(MAKE) envlog
+	$(MAKE) makedir
+	$(MAKE) makebin
+
+makedir:
+	mkdir -p $(BUILD_DIR)
+
+makebin: $(BINNAME)
+	@echo "Complete making."
+
+
+$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
+	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
+
+$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
+
+distclean: clean
+	rm -f $(BINNAME)
+
+clean:
+	rm -rf $(BUILD_DIR)
+	rm -f *.nc
+
+.SUFFIXES:
+.SUFFIXES: .o .f90 .mod
+
+%.mod: %.f90
+	$(MAKE) $(patsubst %.f90,%.o,$<)
+
+$(BUILD_DIR)/%.o: %.f90
+	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
+
+run: jobshell
+	@if [ $(JOBSUB) = "pjsub" ]; then \
+		JID=$$($(JOBSUB) -z jid run.sh $(JOBSUB_OPTION)); if [ $$? -ne 0 ]; then exit 1; fi; \
+		echo "$(JOBSUB) run.sh (job id=$$JID) .."; \
+		set -- `pjwait $$JID`; if [ $$2 != "0" -o $$3 != "0" ]; then exit 1; fi; \
+	else \
+		echo "$(JOBSUB) run.sh"; \
+		$(JOBSUB) run.sh $(JOBSUB_OPTION); \
+	fi
+
+jobshell: export ADDITIONAL_CONF := $(ADDITIONAL_CONF)
+jobshell: export OMP_NUM_THREADS := $(OMP_NUM_THREADS)
+jobshell:
+	@if [ -f $(SYSDEP_DIR)/Mkjobshell.$(SCALE_FE_SYS).sh ]; then \
+		bash $(SYSDEP_DIR)/Mkjobshell.$(SCALE_FE_SYS).sh $(MPIEXEC) $(BINDIR2)            \
+		                                              $(PPNAME) $(INITNAME) $(BINNAME) \
+		                                              $(PPCONF) $(INITCONF) $(RUNCONF) \
+		                                              $(TPROC)                         \
+		                                              $(DATPARAM) $(DATDISTS);         \
+	else \
+		bash $(TOPDIR)/sysdep/Mkjobshell.$(SCALE_FE_SYS).sh $(MPIEXEC) $(BINDIR2)         \
+		                                              $(PPNAME) $(INITNAME) $(BINNAME) \
+		                                              $(PPCONF) $(INITCONF) $(RUNCONF) \
+		                                              $(TPROC)                         \
+		                                              $(DATPARAM) $(DATDISTS);         \
+	fi
+
+.PHONY : clean distclean allclean
+
+include $(TOPDIR)/utils/make/Make_environments
diff --git a/FElib/test/common/linkedlist/Makefile b/FElib/test/common/linkedlist/Makefile
index 5f4a12ad..53e78620 100644
--- a/FElib/test/common/linkedlist/Makefile
+++ b/FElib/test/common/linkedlist/Makefile
@@ -6,54 +6,13 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_linkedlist
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/common/sparsemat/Makefile b/FElib/test/common/sparsemat/Makefile
index 093b59dd..06eece73 100644
--- a/FElib/test/common/sparsemat/Makefile
+++ b/FElib/test/common/sparsemat/Makefile
@@ -6,54 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_sparsemat
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/common/time_manager/Makefile b/FElib/test/common/time_manager/Makefile
index 94e6148c..1d2dc54a 100644
--- a/FElib/test/common/time_manager/Makefile
+++ b/FElib/test/common/time_manager/Makefile
@@ -1,3 +1,4 @@
+
 ################################################################################
 #
 # Makefile for each test program
@@ -6,61 +7,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_time_manager
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	cp test1.conf test.conf
-	mpirun -n 1 ./$(BINNAME) test.conf
-	mv LOG.pe000000 test1_LOG.pe000000
-
-	cp test2.conf test.conf
-	mpirun -n 1 ./$(BINNAME) test.conf
-	mv LOG.pe000000 test2_LOG.pe000000
-
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test1.conf,test2.conf
+TPROC           = 1,1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/common/time_manager/test1.conf b/FElib/test/common/time_manager/test1.conf
index fdc9bdba..bb9639c0 100644
--- a/FElib/test/common/time_manager/test1.conf
+++ b/FElib/test/common/time_manager/test1.conf
@@ -1,3 +1,6 @@
+&PARAM_IO
+  IO_LOG_BASENAME = 'test1_LOG',
+/
 &PARAM_TIME
   TIME_DURATION = 1800D0, 
   TIME_DURATION_UNIT = 'SEC', 
diff --git a/FElib/test/common/time_manager/test2.conf b/FElib/test/common/time_manager/test2.conf
index 26eea9c7..47bb5563 100644
--- a/FElib/test/common/time_manager/test2.conf
+++ b/FElib/test/common/time_manager/test2.conf
@@ -1,3 +1,6 @@
+&PARAM_IO
+  IO_LOG_BASENAME = 'test2_LOG',
+/
 &PARAM_TIME
   TIME_DURATION = 3600D0, 
   TIME_DURATION_UNIT = 'SEC', 
diff --git a/FElib/test/common/time_manager/test_time_manager.f90 b/FElib/test/common/time_manager/test_time_manager.f90
index 14b96ad3..835c8caf 100644
--- a/FElib/test/common/time_manager/test_time_manager.f90
+++ b/FElib/test/common/time_manager/test_time_manager.f90
@@ -77,6 +77,8 @@ subroutine init()
     namelist /PARAM_OCN_DYN/ &
       TIME_DT, TIME_DT_UNIT
     integer :: ierr
+
+    character(len=H_LONG) :: cnf_fname              ! config file for launcher
     !-------------------------------------------------
 
     call PRC_MPIstart( comm )
@@ -87,7 +89,8 @@ subroutine init()
     call PRC_ERRHANDLER_setup( .false., ismaster ) ! [IN]
 
     ! setup scale_io
-    call IO_setup( "test_time_manager", "test.conf", allow_noconf = .false. )
+    cnf_fname = IO_ARG_getfname( ismaster )
+    call IO_setup( "test_time_manager", cnf_fname, allow_noconf = .false. )
 
     ! setup log
     call IO_LOG_setup( myrank, ismaster )   
diff --git a/FElib/test/common/timeint_rk/Makefile b/FElib/test/common/timeint_rk/Makefile
index 491997af..e163ddba 100644
--- a/FElib/test/common/timeint_rk/Makefile
+++ b/FElib/test/common/timeint_rk/Makefile
@@ -6,55 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_timeint_rk
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME)
-
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/framework/model_framework/Makefile b/FElib/test/framework/model_framework/Makefile
index bcb7a395..8b31f46a 100644
--- a/FElib/test/framework/model_framework/Makefile
+++ b/FElib/test/framework/model_framework/Makefile
@@ -6,63 +6,20 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_model_framework
-
-LIBS = $(LIBDIR)/libScaleFECore.a
-
 OBJS = mod_atmos_component.o \
-       mod_atmos_vars.o      \
-			 mod_atmos_mesh.o      \
+       mod_atmos_vars.o         \
+			 mod_atmos_mesh.o   \
 			 mod_atmos_dyn.o
 
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -rf *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
 
 $(BUILD_DIR)/test_model_framework.o: $(BUILD_DIR)/mod_atmos_component.o
 $(BUILD_DIR)/mod_atmos_component.o:  \
diff --git a/sysdep/Mkjobshell.FUGAKU.sh b/sysdep/Mkjobshell.FUGAKU.sh
index c47fba01..116b436d 100644
--- a/sysdep/Mkjobshell.FUGAKU.sh
+++ b/sysdep/Mkjobshell.FUGAKU.sh
@@ -55,6 +55,8 @@ if [ ! ${RUNCONF} = "NONE" ]; then
       RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME} ${CONFLIST[i]} "|| exit 1"`
       FILES_LLIO=`echo -e ${FILES_LLIO} ${CONFLIST[i]}`
    done
+else
+   RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME}"|| exit 1"`
 fi
 
 array=( `echo ${TPROC} | tr -s 'x' ' '`)
@@ -75,7 +77,7 @@ cat << EOF1 > ./run.sh
 #PJM -L eco_state=2
 #PJM -L rscgrp="small"
 #PJM -L node=$(((TPROC+3)/4)):torus
-#PJM -L elapse=00:20:00
+#PJM -L elapse=00:10:00
 #PJM --mpi "max-proc-per-node=4"
 #PJM -j
 #PJM -s
@@ -93,7 +95,7 @@ export FLIB_BARRIER=HARD
 ${ADDITIONAL_CONF}
 
 llio_transfer /home/apps/oss/scale/llio.list
-export LD_LIBRARY_PATH=/lib64:/opt/FJSVxtclanga/tcsds-mpi-latest/lib64:/opt/FJSVxtclanga/tcsds-1.2.39/lib64:`cat /home/apps/oss/scale/llio.list | sed 's:\(.*/lib\(\|64\)\)/.*:\1:' | uniq | sed -z 's/\n/:/g'`
+export LD_LIBRARY_PATH=/lib64:/opt/FJSVxtclanga/tcsds-mpi-latest/lib64:/opt/FJSVxtclanga/tcsds-latest/lib64:`cat /home/apps/oss/scale/llio.list | sed 's:\(.*/lib\(\|64\)\)/.*:\1:' | uniq | sed -z 's/\n/:/g'`
 
 
 #. /vol0004/apps/oss/spack/share/spack/setup-env.sh
diff --git a/sysdep/Mkjobshell.Linux64-gnu-ompi.sh b/sysdep/Mkjobshell.Linux64-gnu-ompi.sh
index 7694a4d2..e439af28 100644
--- a/sysdep/Mkjobshell.Linux64-gnu-ompi.sh
+++ b/sysdep/Mkjobshell.Linux64-gnu-ompi.sh
@@ -48,6 +48,8 @@ if [ ! ${RUNCONF} = "NONE" ]; then
       let i="n - 1"
       RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME} ${CONFLIST[i]} "|| exit 1"`
    done
+else
+   RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME}"|| exit 1"`
 fi
 
 
diff --git a/sysdep/Mkjobshell.Linux64-intel-impi.sh b/sysdep/Mkjobshell.Linux64-intel-impi.sh
index baf4f0a4..3bdc7edf 100644
--- a/sysdep/Mkjobshell.Linux64-intel-impi.sh
+++ b/sysdep/Mkjobshell.Linux64-intel-impi.sh
@@ -48,6 +48,8 @@ if [ ! ${RUNCONF} = "NONE" ]; then
       let i="n - 1"
       RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME} ${CONFLIST[i]} "|| exit 1"`
    done
+else
+   RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME}"|| exit 1"`
 fi
 
 
diff --git a/sysdep/Mkjobshell.Linux64-llvm-intel-impi.sh b/sysdep/Mkjobshell.Linux64-llvm-intel-impi.sh
index baf4f0a4..3bdc7edf 100644
--- a/sysdep/Mkjobshell.Linux64-llvm-intel-impi.sh
+++ b/sysdep/Mkjobshell.Linux64-llvm-intel-impi.sh
@@ -48,6 +48,8 @@ if [ ! ${RUNCONF} = "NONE" ]; then
       let i="n - 1"
       RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME} ${CONFLIST[i]} "|| exit 1"`
    done
+else
+   RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME}"|| exit 1"`
 fi
 
 
diff --git a/sysdep/Mkjobshell.MacOSX-gnu-ompi.sh b/sysdep/Mkjobshell.MacOSX-gnu-ompi.sh
index d143cad2..f7058e0f 100644
--- a/sysdep/Mkjobshell.MacOSX-gnu-ompi.sh
+++ b/sysdep/Mkjobshell.MacOSX-gnu-ompi.sh
@@ -48,6 +48,8 @@ if [ ! ${RUNCONF} = "NONE" ]; then
       let i="n - 1"
       RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME} ${CONFLIST[i]} "|| exit 1"`
    done
+else
+   RUN_MAIN=`echo -e "${RUN_MAIN}\n"${MPIEXEC} ${PROCLIST[i]} ${BINDIR}/${BINNAME}"|| exit 1"`
 fi