diff --git a/tests/test_shops.rs b/tests/test_shops.rs
index 32244d0..cf230c9 100644
--- a/tests/test_shops.rs
+++ b/tests/test_shops.rs
@@ -1143,7 +1143,8 @@ async fn test_player_cant_sell_if_meseta_would_go_over_max() {
         amount: 1,
     })))).await.err().unwrap();
     //assert_eq!(ack, ShipError::ItemStateError(ItemStateError::FullOfMeseta));
-    assert!(matches!(ack.downcast::<ShipError>().unwrap(), ShipError::ItemStateError(ItemStateError::FullOfMeseta)));
+    assert!(matches!(ack.downcast::<ItemStateError>().unwrap(), ItemStateError::FullOfMeseta));
+    //assert!(matches!(ack.downcast::<ShipError>().unwrap(), ShipError::ItemStateError(ItemStateError::FullOfMeseta)));
 
     let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
     assert_eq!(c1_meseta.0, 999995);
diff --git a/tests/test_trade.rs b/tests/test_trade.rs
index 61bff99..4155a46 100644
--- a/tests/test_trade.rs
+++ b/tests/test_trade.rs
@@ -3155,7 +3155,7 @@ async fn test_client_tries_to_start_two_trades() {
         trade: TradeRequestCommand::Initialize(TradeRequestInitializeCommand::Initialize, 0)
     })))).await.err().unwrap();
 
-    assert!(matches!(ack.downcast::<ShipError>().unwrap(), ShipError::TradeError(TradeError::ClientAlreadyInTrade)));
+    assert!(matches!(ack.downcast::<TradeError>().unwrap(), TradeError::ClientAlreadyInTrade));
 }
 
 #[async_std::test]
@@ -3187,14 +3187,14 @@ async fn test_client_tries_trading_with_client_already_trading() {
         target: 0,
         trade: TradeRequestCommand::Initialize(TradeRequestInitializeCommand::Initialize, 0)
     })))).await.err().unwrap();
-    assert!(matches!(ack.downcast::<ShipError>().unwrap(), ShipError::TradeError(TradeError::OtherAlreadyInTrade)));
+    assert!(matches!(ack.downcast::<TradeError>().unwrap(), TradeError::OtherAlreadyInTrade));
 
     let ack = ship.handle(ClientId(3), RecvShipPacket::DirectMessage(DirectMessage::new(1, GameMessage::TradeRequest(TradeRequest {
         client: 2,
         target: 0,
         trade: TradeRequestCommand::Initialize(TradeRequestInitializeCommand::Initialize, 1)
     })))).await.err().unwrap();
-    assert!(matches!(ack.downcast::<ShipError>().unwrap(), ShipError::TradeError(TradeError::OtherAlreadyInTrade)));
+    assert!(matches!(ack.downcast::<TradeError>().unwrap(), TradeError::OtherAlreadyInTrade));
 }
 
 #[async_std::test]