refs #7529 Generally fixes the issue with different Units

but more testing is necessary