merge executor2_test to executor_test file