moar drop_master in tests