diff --git a/tests/acceptance/bundle/BundleTagCest.php b/tests/acceptance/bundle/BundleTagCest.php
index f9ea31e..276bc74 100644
--- a/tests/acceptance/bundle/BundleTagCest.php
+++ b/tests/acceptance/bundle/BundleTagCest.php
@@ -203,16 +203,16 @@ public function testMemberTagRemovedWhenBundleCancelled(AcceptanceTester $I)
 		$I->memberMouseAssignBundleToMember($I, $emailAddress, 'Bundle');
 
 		// Check subscriber exists.
-		$subscriberID = $I->apiCheckSubscriberExists($I, $emailAddress);
+		$subscriber = $I->apiCheckSubscriberExists($I, $emailAddress);
 
 		// Check that the subscriber has been assigned to the tag.
-		$I->apiCheckSubscriberHasTag($I, $subscriberID, $_ENV['CONVERTKIT_API_TAG_ID']);
+		$I->apiCheckSubscriberHasTag($I, $subscriber['id'], $_ENV['CONVERTKIT_API_TAG_ID']);
 
 		// Cancel the user's bundle.
 		$I->memberMouseCancelMemberBundle($I, $emailAddress, 'Bundle');
 
 		// Check that the subscriber is no longer assigned to the tag.
-		$I->apiCheckSubscriberHasNoTags($I, $subscriberID);
+		$I->apiCheckSubscriberHasNoTags($I, $subscriber['id']);
 	}
 
 	/**
diff --git a/tests/acceptance/member/MemberTagCest.php b/tests/acceptance/member/MemberTagCest.php
index 48afc61..11246b9 100644
--- a/tests/acceptance/member/MemberTagCest.php
+++ b/tests/acceptance/member/MemberTagCest.php
@@ -172,10 +172,10 @@ public function testMemberTagRemovedWhenMembershipLevelCancelled(AcceptanceTeste
 		$I->memberMouseCreateMember($I, $emailAddress);
 
 		// Check subscriber exists.
-		$subscriberID = $I->apiCheckSubscriberExists($I, $emailAddress);
+		$subscriber = $I->apiCheckSubscriberExists($I, $emailAddress);
 
 		// Check that the subscriber has been assigned to the tag.
-		$I->apiCheckSubscriberHasTag($I, $subscriberID, $_ENV['CONVERTKIT_API_TAG_ID']);
+		$I->apiCheckSubscriberHasTag($I, $subscriber['id'], $_ENV['CONVERTKIT_API_TAG_ID']);
 
 		// Cancel the user's membership level.
 		$I->amOnAdminPage('admin.php?page=manage_members');
@@ -183,17 +183,11 @@ public function testMemberTagRemovedWhenMembershipLevelCancelled(AcceptanceTeste
 		$I->click('Access Rights');
 		$I->click('Cancel Membership');
 
-		// Accept popups
-		// We have to wait as there's no specific event MemberMouse fires to tell
-		// us it completed changing the membership level.
-		$I->wait(5);
-		$I->acceptPopup();
-		$I->wait(5);
-		$I->acceptPopup();
-		$I->wait(5);
+		// Accept popups.
+		$I->memberMouseAcceptPopups($I, 2);
 
 		// Check that the subscriber is no longer assigned to the tag.
-		$I->apiCheckSubscriberHasNoTags($I, $subscriberID);
+		$I->apiCheckSubscriberHasNoTags($I, $subscriber['id']);
 	}
 
 	/**
@@ -269,27 +263,21 @@ public function testMemberTagRemovedWhenDeleted(AcceptanceTester $I)
 		$I->memberMouseCreateMember($I, $emailAddress);
 
 		// Check subscriber exists.
-		$subscriberID = $I->apiCheckSubscriberExists($I, $emailAddress);
+		$subscriber = $I->apiCheckSubscriberExists($I, $emailAddress);
 
 		// Check that the subscriber has been assigned to the tag.
-		$I->apiCheckSubscriberHasTag($I, $subscriberID, $_ENV['CONVERTKIT_API_TAG_ID']);
+		$I->apiCheckSubscriberHasTag($I, $subscriber['id'], $_ENV['CONVERTKIT_API_TAG_ID']);
 
 		// Cancel the user's membership level.
 		$I->amOnAdminPage('admin.php?page=manage_members');
 		$I->click($emailAddress);
 		$I->click('Delete Member');
 
-		// Accept popups
-		// We have to wait as there's no specific event MemberMouse fires to tell
-		// us it completed changing the membership level.
-		$I->wait(5);
-		$I->acceptPopup();
-		$I->wait(5);
-		$I->acceptPopup();
-		$I->wait(5);
+		// Accept popups.
+		$I->memberMouseAcceptPopups($I, 2);
 
 		// Check that the subscriber is no longer assigned to the tag.
-		$I->apiCheckSubscriberHasNoTags($I, $subscriberID);
+		$I->apiCheckSubscriberHasNoTags($I, $subscriber['id']);
 	}
 
 	/**