diff --git a/src/instance.rs b/src/instance.rs
index 0cd65f4..9795557 100644
--- a/src/instance.rs
+++ b/src/instance.rs
@@ -8,6 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::api::{Limit, LimitType};
 use crate::errors::ChorusResult;
+use crate::gateway::{Gateway, GatewayHandle};
 use crate::ratelimiter::ChorusRequest;
 use crate::types::types::subconfigs::limits::rates::RateLimits;
 use crate::types::{GeneralConfiguration, User, UserSettings};
@@ -88,13 +89,14 @@ impl fmt::Display for Token {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct UserMeta {
     pub belongs_to: Rc<RefCell<Instance>>,
     pub token: String,
     pub limits: Option<HashMap<LimitType, Limit>>,
     pub settings: UserSettings,
     pub object: User,
+    pub gateway: GatewayHandle,
 }
 
 impl UserMeta {
@@ -112,6 +114,7 @@ impl UserMeta {
         limits: Option<HashMap<LimitType, Limit>>,
         settings: UserSettings,
         object: User,
+        gateway: GatewayHandle,
     ) -> UserMeta {
         UserMeta {
             belongs_to,
@@ -119,19 +122,24 @@ impl UserMeta {
             limits,
             settings,
             object,
+            gateway,
         }
     }
 
     /// Creates a new 'shell' of a user. The user does not exist as an object, and exists so that you have
     /// a UserMeta object to make Rate Limited requests with. This is useful in scenarios like
     /// registering or logging in to the Instance, where you do not yet have a User object, but still
-    /// need to make a RateLimited request.
-    pub(crate) fn shell(instance: Rc<RefCell<Instance>>, token: String) -> UserMeta {
+    /// need to make a RateLimited request. To use the [`GatewayHandle`], you will have to identify
+    /// first.
+    pub(crate) async fn shell(instance: Rc<RefCell<Instance>>, token: String) -> UserMeta {
         let settings = UserSettings::default();
         let object = User::default();
+        let wss_url = instance.borrow().urls.wss.clone();
+        // Dummy gateway object
+        let gateway = Gateway::new(wss_url).await.unwrap();
         UserMeta {
-            belongs_to: instance.clone(),
             token,
+            belongs_to: instance.clone(),
             limits: instance
                 .borrow()
                 .limits_information
@@ -139,6 +147,7 @@ impl UserMeta {
                 .map(|info| info.ratelimits.clone()),
             settings,
             object,
+            gateway,
         }
     }
 }
diff --git a/tests/gateway.rs b/tests/gateway.rs
index 199e14b..21a2018 100644
--- a/tests/gateway.rs
+++ b/tests/gateway.rs
@@ -8,7 +8,8 @@ use chorus::types::{self, Channel};
 async fn test_gateway_establish() {
     let bundle = common::setup().await;
 
-    Gateway::new(bundle.urls.wss).await.unwrap();
+    Gateway::new(bundle.urls.wss.clone()).await.unwrap();
+    common::teardown(bundle).await
 }
 
 #[tokio::test]
@@ -16,25 +17,21 @@ async fn test_gateway_establish() {
 async fn test_gateway_authenticate() {
     let bundle = common::setup().await;
 
-    let gateway = Gateway::new(bundle.urls.wss).await.unwrap();
+    let gateway = Gateway::new(bundle.urls.wss.clone()).await.unwrap();
 
     let mut identify = types::GatewayIdentifyPayload::common();
-    identify.token = bundle.user.token;
+    identify.token = bundle.user.token.clone();
 
     gateway.send_identify(identify).await;
+    common::teardown(bundle).await
 }
 
 #[tokio::test]
 async fn test_self_updating_structs() {
     let mut bundle = common::setup().await;
-    let gateway = Gateway::new(bundle.urls.wss).await.unwrap();
-    let mut identify = types::GatewayIdentifyPayload::common();
-    identify.token = bundle.user.token.clone();
-    gateway.send_identify(identify).await;
-    let channel_receiver = gateway.observe(bundle.channel.clone()).await;
-    let received_channel = channel_receiver.borrow();
-    assert_eq!(*received_channel, bundle.channel);
-    drop(received_channel);
+    let channel_updater = bundle.user.gateway.observe(bundle.channel.clone()).await;
+    let received_channel = channel_updater.borrow().clone();
+    assert_eq!(received_channel, bundle.channel);
     let channel = &mut bundle.channel;
     let modify_data = types::ChannelModifySchema {
         name: Some("beepboop".to_string()),
@@ -43,6 +40,7 @@ async fn test_self_updating_structs() {
     Channel::modify(channel, modify_data, channel.id, &mut bundle.user)
         .await
         .unwrap();
-    let received_channel = channel_receiver.borrow();
+    let received_channel = channel_updater.borrow();
     assert_eq!(received_channel.name.as_ref().unwrap(), "beepboop");
+    common::teardown(bundle).await
 }