refs #3232 Minor changes
Fixing tests
Merge remote-tracking branch 'origin/master'