Minor adjustments in tests