Refs #5992 More improvements, fixes and tests

to do: the view