Prepare for 2.1.0
Actually test the auto mode