modify test hotfix
jikken branch
jikken2
jikken
Merge branch 'jikken2'

Conflicts:
	test