some smaller fixups in fragile tests.