switch benchmark test to stampede
remove redundant test
fix a test comment
more test fixes
merge from devel