refs #6852 Small changes to unit tests