refs #7529 All seems work except some tests

which can be incorrect with new changes.