More (final?) test fixes