Minor adjustments to the unit tests