unittest adjustments
refs #637