Feature/expect test#217

cenwangumass merged 4 commits intodevelopsimopt-admin/simopt:developfrom

feature/expect-testsimopt-admin/simopt:feature/expect-testCopy head branch name to clipboard