unittest adjustments
refs #713