refs #3490 Fix more tests, should be almost green?