minor adjustments to unit tests to fix warnings