refs #3074 fix some tests