more test

tests/reloading_test.cpp

@@ -997,18 +997,21 @@
                 WHEN( "the player triggers auto reload until the second revolver is full" ) {
 
                     reload_a_revolver( dummy, gun2, *ammo );
+                    gun2 = dummy.get_wielded_item();
                     REQUIRE( gun2->ammo_remaining( ) == gun2->ammo_capacity( ammo->ammo_type() ) );
 
                     THEN( "no activity is generated" ) {
                         CAPTURE( dummy.activity.id() );
                         CHECK( !dummy.activity );
                     }
+                    gun2 = dummy.get_wielded_item();
                     WHEN( "the player triggers auto reload again" ) {
-                        CAPTURE( gun2->ammo_remaining( ) );
+                        REQUIRE(!dummy.activity);
+                        CAPTURE( dummy.get_wielded_item()->ammo_remaining( ) );
                         g->reload_weapon( false );
                         THEN( "no activity is generated" ) {
                             CAPTURE( dummy.activity.id() );
                             CHECK( !dummy.activity );
                         }
                     }
                 }

tests/visitable_remove_test.cpp

@@ -159,7 +159,8 @@
 
         WHEN( "one of the bottles is wielded" ) {
             CAPTURE( p.all_items_loc().size() );
-            p.wield( p.all_items_loc().back() );
+            REQUIRE( p.all_items_loc().front()->typeId() == container_id );
+            p.wield( p.all_items_loc().front() );
             REQUIRE( p.get_wielded_item()->typeId() == container_id );
             REQUIRE( count_items( p, container_id ) == count );
             REQUIRE( count_items( p, liquid_id ) == count );