refs #4996 many new tests and many fixes, more will follow