refs #7144 Few more additions - test still under construction.