Cut off eval_test from main
Merge pull request #1004 from kano4/pr-cut-off-eval_test

Cut off eval_test from main