refs #2174 fixed some tests