Align some test steps between master and v1.0.1