diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2c89c63..cb29d71 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Get Aptos
         uses: pontem-network/get-aptos@main
         with:
-          version: aptos-cli-v1.0.0
+          version: aptos-cli-v1.0.3
           token: ${{ secrets.GITHUB_TOKEN }}
           prover: true
 
diff --git a/Move.toml b/Move.toml
index b4f1e75..2ee3583 100644
--- a/Move.toml
+++ b/Move.toml
@@ -30,7 +30,7 @@ local = "./liquidswap_init/"
 
 [dependencies.AptosFramework]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "main"
+rev = "mainnet"
 subdir = "aptos-move/framework/aptos-framework"
 
 [dependencies.UQ64x64]
diff --git a/README.md b/README.md
index 5c9ef11..c68077f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To integrate Liquidswap into your project vist [integration](https://docs.liquid
 
 ### Build
 
-**Important:** we recommend Aptos CLI v1.0.0, as the newest version contains bugs related to dependencies resolving.
+**Important:** we recommend Aptos CLI v1.0.3.
 
 [Aptos CLI](https://github.com/aptos-labs/aptos-core/releases) required:
 
diff --git a/liquidswap_init/Move.toml b/liquidswap_init/Move.toml
index 762881d..3336f0c 100644
--- a/liquidswap_init/Move.toml
+++ b/liquidswap_init/Move.toml
@@ -8,5 +8,5 @@ liquidswap = "0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12
 
 [dependencies.AptosFramework]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "main"
+rev = "mainnet"
 subdir = "aptos-move/framework/aptos-framework"
diff --git a/liquidswap_lp/Move.toml b/liquidswap_lp/Move.toml
index c89c52a..caf9f8f 100644
--- a/liquidswap_lp/Move.toml
+++ b/liquidswap_lp/Move.toml
@@ -8,5 +8,5 @@ liquidswap_lp = "0x05a97986a9d031c4567e15b797be516910cfcb4156312482efc6a19c0a30c
 
 [dev-dependencies.MoveStdlib]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "main"
+rev = "mainnet"
 subdir = "aptos-move/framework/move-stdlib"
diff --git a/liquidswap_router_v2/sources/router_v2.move b/liquidswap_router_v2/sources/router_v2.move
index f3515b7..6d53141 100644
--- a/liquidswap_router_v2/sources/router_v2.move
+++ b/liquidswap_router_v2/sources/router_v2.move
@@ -15,8 +15,6 @@ module liquidswap::router_v2 {
     const ERR_WRONG_AMOUNT: u64 = 200;
     /// Wrong reserve used.
     const ERR_WRONG_RESERVE: u64 = 201;
-    /// Wrong order of coin parameters.
-    const ERR_WRONG_COIN_ORDER: u64 = 208;
     /// Insufficient amount in Y reserves.
     const ERR_INSUFFICIENT_Y_AMOUNT: u64 = 202;
     /// Insufficient amount in X reserves.
@@ -31,6 +29,8 @@ module liquidswap::router_v2 {
     const ERR_UNREACHABLE: u64 = 207;
     /// Provided coins amount cannot be converted without the overflow at the current price
     const ERR_COIN_CONVERSION_OVERFLOW: u64 = 208;
+    /// Wrong order of coin parameters.
+    const ERR_WRONG_COIN_ORDER: u64 = 208;
 
     // Consts
     const MAX_U64: u128 = 18446744073709551615;
diff --git a/liquidswap_router_v2/tests/router_v2_tests.move b/liquidswap_router_v2/tests/router_v2_tests.move
index df1a181..1a7f124 100644
--- a/liquidswap_router_v2/tests/router_v2_tests.move
+++ b/liquidswap_router_v2/tests/router_v2_tests.move
@@ -110,7 +110,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 208)]
+    #[expected_failure(abort_code = router_v2::ERR_WRONG_COIN_ORDER)]
     fun test_cannot_add_liquidity_to_pool_in_reverse_order() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -133,7 +133,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 203)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_X_AMOUNT)]
     fun test_add_liquidity_to_fail_with_insufficient_x_coins() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(0, 0);
 
@@ -153,7 +153,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_add_liquidity_to_fail_with_insufficient_y_coins() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(0, 0);
 
@@ -204,7 +204,7 @@ module liquidswap::router_v2_tests {
     //  (it's checked with generic params, so I don't know)
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_remove_liquidity_to_fail_if_less_than_minimum_x() {
         let (_, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -223,7 +223,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_remove_liquidity_to_fail_if_less_than_minimum_y() {
         let (_, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -310,7 +310,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_swap_exact_coin_for_coin_to_fail_if_less_than_minimum_out() {
         let (coin_admin, _) = register_pool_with_liquidity(101, 10100);
 
@@ -389,7 +389,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 206)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_VAL_MAX_LESS_THAN_NEEDED)]
     fun test_swap_coin_for_exact_coin_router_check_fails() {
         let (coin_admin, _) = register_pool_with_liquidity(10000000000, 2800000000000);
 
@@ -430,7 +430,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_fail_if_price_fell_behind_threshold() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -448,7 +448,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 104)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_EMPTY_COIN_IN)]
     fun test_fail_if_swap_zero_coin() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -934,19 +934,19 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 200)]
+    #[expected_failure(abort_code = router_v2::ERR_WRONG_AMOUNT)]
     fun test_fail_convert_with_current_price_coin_in_val() {
         router_v2::convert_with_current_price(0, 1, 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 201)]
+    #[expected_failure(abort_code = router_v2::ERR_WRONG_RESERVE)]
     fun test_fail_convert_with_current_price_reserve_in_size() {
         router_v2::convert_with_current_price(1, 0, 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 201)]
+    #[expected_failure(abort_code = router_v2::ERR_WRONG_RESERVE)]
     fun test_fail_convert_with_current_price_reserve_out_size() {
         router_v2::convert_with_current_price(1, 1, 0);
     }
@@ -1077,7 +1077,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_fail_if_price_fell_behind_threshold_unchecked() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -1095,7 +1095,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1113,7 +1113,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked_1() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1131,7 +1131,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked_2() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1149,7 +1149,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coin_for_coin_unchecked_fails() {
         let (coin_admin, _) = register_pool_with_liquidity(10000000000, 2800000000000);
 
@@ -1185,7 +1185,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 203)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_X_AMOUNT)]
     fun test_calc_optimal_coin_values_1() {
         // 100 BTC, 2,800,000 USDT
         let (_, _) = register_pool_with_liquidity(10000000000, 2800000000000);
@@ -1215,7 +1215,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_calc_optimal_coin_values_4() {
         // 100 BTC, 28000 USDT
         let (_, _) = register_pool_with_liquidity(10000000000, 28000000000);
@@ -1286,25 +1286,25 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_fees_config_fail_if_pool_does_not_exists() {
         router_v2::get_fees_config<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_fee_fail_if_pool_does_not_exists() {
         router_v2::get_fee<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fees_config_fail_if_pool_does_not_exists() {
         router_v2::get_dao_fees_config<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fee_fail_if_pool_does_not_exists() {
         router_v2::get_dao_fee<BTC, USDT, Uncorrelated>();
     }
@@ -1342,7 +1342,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_get_amount_in_aborts_if_coin_out_bigger_than_reserves() {
         // 100 BTC, 28000 USDT
         let (_, _) = register_pool_with_liquidity(28000000000, 28000000000);
@@ -1351,7 +1351,7 @@ module liquidswap::router_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router_v2::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_get_amount_in_if_coin_out_exactly_equals_reserve_out() {
         // 100 BTC, 28000 USDT
         let (_, _) = register_pool_with_liquidity(28000000000, 28000000000);
@@ -1360,7 +1360,7 @@ module liquidswap::router_v2_tests {
     }
     
     #[test]
-    #[expected_failure(abort_code = 208)]
+    #[expected_failure(abort_code = router_v2::ERR_COIN_CONVERSION_OVERFLOW)]
     fun test_add_liquidity_with_imbalanced_reserves() {
         // 100 BTC, 28000 USDT
         let (coin_admin, lp_owner) = register_pool_with_liquidity(1, 10000000);
diff --git a/liquidswap_router_v2/tests/scripts_v2_tests.move b/liquidswap_router_v2/tests/scripts_v2_tests.move
index 73358e1..4e9b7f9 100644
--- a/liquidswap_router_v2/tests/scripts_v2_tests.move
+++ b/liquidswap_router_v2/tests/scripts_v2_tests.move
@@ -217,7 +217,7 @@ module liquidswap::scripts_v2_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     public entry fun test_unchecked_swap_fails_if_price_better_than_available_requested() {
         let (coin_admin, lp_owner) = register_pool_with_existing_liquidity(101, 10100);
 
diff --git a/sources/swap/router.move b/sources/swap/router.move
index a968c4a..6a26955 100644
--- a/sources/swap/router.move
+++ b/sources/swap/router.move
@@ -17,8 +17,6 @@ module liquidswap::router {
     const ERR_WRONG_AMOUNT: u64 = 200;
     /// Wrong reserve used.
     const ERR_WRONG_RESERVE: u64 = 201;
-    /// Wrong order of coin parameters.
-    const ERR_WRONG_COIN_ORDER: u64 = 208;
     /// Insufficient amount in Y reserves.
     const ERR_INSUFFICIENT_Y_AMOUNT: u64 = 202;
     /// Insufficient amount in X reserves.
@@ -31,6 +29,8 @@ module liquidswap::router {
     const ERR_COIN_VAL_MAX_LESS_THAN_NEEDED: u64 = 206;
     /// Marks the unreachable place in code
     const ERR_UNREACHABLE: u64 = 207;
+    /// Wrong order of coin parameters.
+    const ERR_WRONG_COIN_ORDER: u64 = 208;
 
     // Public functions.
 
diff --git a/tests/coin_helper_tests.move b/tests/coin_helper_tests.move
index 083be77..6b0faf1 100644
--- a/tests/coin_helper_tests.move
+++ b/tests/coin_helper_tests.move
@@ -78,13 +78,13 @@ module liquidswap::coin_helper_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3001)]
+    #[expected_failure(abort_code = coin_helper::ERR_IS_NOT_COIN)]
     fun test_assert_is_coin_failure() {
         coin_helper::assert_is_coin<USDT>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 3000)]
+    #[expected_failure(abort_code = coin_helper::ERR_CANNOT_BE_THE_SAME_COIN)]
     fun test_cant_be_same_coin_failure() {
         genesis::setup();
 
diff --git a/tests/compare_tests.move b/tests/compare_tests.move
index aac65d7..6150f07 100644
--- a/tests/compare_tests.move
+++ b/tests/compare_tests.move
@@ -60,7 +60,7 @@ module liquidswap::compare_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3000)]
+    #[expected_failure(abort_code = coin_helper::ERR_CANNOT_BE_THE_SAME_COIN)]
     fun test_is_sorted_cannot_be_equal() {
         assert!(coin_helper::is_sorted<AptosCoin, AptosCoin>(), 1);
     }
diff --git a/tests/curves_tests.move b/tests/curves_tests.move
index 42adeca..49c307c 100644
--- a/tests/curves_tests.move
+++ b/tests/curves_tests.move
@@ -1,6 +1,14 @@
 #[test_only]
 module liquidswap::curves_tests {
-    use liquidswap::curves::{is_stable, Uncorrelated, Stable, is_uncorrelated, is_valid_curve, assert_valid_curve};
+    use liquidswap::curves::{
+        Self,
+        is_stable,
+        Uncorrelated,
+        Stable,
+        is_uncorrelated,
+        is_valid_curve,
+        assert_valid_curve
+    };
 
     struct UnknownCurve {}
 
@@ -30,7 +38,7 @@ module liquidswap::curves_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code=10001)]
+    #[expected_failure(abort_code = curves::ERR_INVALID_CURVE)]
     fun test_assert_is_valid_curve_fails() {
         assert_valid_curve<UnknownCurve>();
     }
diff --git a/tests/dao_storage_tests.move b/tests/dao_storage_tests.move
index 11b1da1..beeb501 100644
--- a/tests/dao_storage_tests.move
+++ b/tests/dao_storage_tests.move
@@ -46,7 +46,7 @@ module liquidswap::dao_storage_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 401)]
+    #[expected_failure(abort_code = dao_storage::ERR_NOT_REGISTERED)]
     fun test_deposit_fail_if_not_registered() {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -93,7 +93,7 @@ module liquidswap::dao_storage_tests {
     }
 
     #[test(dao_admin_acc = @dao_admin)]
-    #[expected_failure(abort_code = 65542)]
+    #[expected_failure(abort_code = 65542, location = aptos_framework::coin)]
     fun test_withdraw_fail_if_more_deposited(dao_admin_acc: signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -115,7 +115,7 @@ module liquidswap::dao_storage_tests {
     }
 
     #[test(dao_admin_acc = @0xca)]
-    #[expected_failure(abort_code = 402)]
+    #[expected_failure(abort_code = dao_storage::ERR_NOT_ADMIN_ACCOUNT)]
     fun test_withdraw_fail_if_not_dao_admin(dao_admin_acc: signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
diff --git a/tests/emergency_tests.move b/tests/emergency_tests.move
index f4acb25..3ca983c 100644
--- a/tests/emergency_tests.move
+++ b/tests/emergency_tests.move
@@ -40,7 +40,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @0x13)]
-    #[expected_failure(abort_code = 4000)]
+    #[expected_failure(abort_code = emergency::ERR_NO_PERMISSIONS)]
     public fun test_wrong_account_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -48,7 +48,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     public fun test_emergency_second_time_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -57,7 +57,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin, tmp = @0x13)]
-    #[expected_failure(abort_code = 4000)]
+    #[expected_failure(abort_code = emergency::ERR_NO_PERMISSIONS)]
     public fun test_resume_wrong_account_fails(emergency_acc: signer, tmp: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -67,7 +67,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4003)]
+    #[expected_failure(abort_code = emergency::ERR_NOT_EMERGENCY)]
     public fun test_resume_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -75,7 +75,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     public fun test_emergency_assert_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -120,7 +120,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4002)]
+    #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_resume_after_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -130,7 +130,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4002)]
+    #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_pause_after_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -139,7 +139,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4002)]
+    #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -148,7 +148,7 @@ module liquidswap::emergency_tests {
     }
 
     #[test(emergency_acc = @0x13)]
-    #[expected_failure(abort_code = 4000)]
+    #[expected_failure(abort_code = emergency::ERR_NO_PERMISSIONS)]
     public fun test_disable_wrong_account_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
diff --git a/tests/flashloan_tests.move b/tests/flashloan_tests.move
index c9a75d6..d5e6098 100644
--- a/tests/flashloan_tests.move
+++ b/tests/flashloan_tests.move
@@ -336,7 +336,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_fail_if_emergency(emergency_acc: signer) {
         let (_, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -351,7 +351,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 110)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_EMPTY_COIN_LOAN)]
     fun test_fail_if_flashloan_zero_amount() {
         let (_, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -364,7 +364,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_fail_if_pay_less_flashloaned_coins() {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -379,7 +379,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_fail_if_pay_equal_flashloaned_coins() {
         let (_, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -392,7 +392,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65542)]
+    #[expected_failure(abort_code = 65542, location = aptos_framework::coin)]
     fun test_fail_if_flashloan_more_than_reserved() {
         let (_, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -405,7 +405,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_mint_when_pool_is_locked() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -428,7 +428,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_swap_when_pool_is_locked() {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -454,7 +454,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_burn_when_pool_is_locked() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -477,7 +477,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_flashloan_when_pool_is_locked() {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -501,7 +501,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_get_reserves_when_pool_is_locked() {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -520,7 +520,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_fail_if_get_cumulative_prices_when_pool_is_locked() {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -539,7 +539,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_set_fee_fail_if_pool_is_locked(fee_admin: signer) {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
@@ -558,7 +558,7 @@ module liquidswap::flashloan_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 111)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_set_dao_fee_fail_if_pool_is_locked(fee_admin: signer) {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
 
diff --git a/tests/global_config_tests.move b/tests/global_config_tests.move
index ca04dd8..11b6d6c 100644
--- a/tests/global_config_tests.move
+++ b/tests/global_config_tests.move
@@ -2,6 +2,7 @@
 module liquidswap::global_config_tests {
     use liquidswap::global_config;
     use liquidswap::curves::{Uncorrelated, Stable};
+    use liquidswap::curves;
     use aptos_framework::account;
 
     struct InvalidCurve {}
@@ -24,19 +25,19 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_get_dao_admin_fail_if_config_is_not_initialized() {
         global_config::get_dao_admin();
     }
 
     #[test(dao_admin = @dao_admin)]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_set_dao_admin_fail_if_config_is_not_initialized(dao_admin: signer) {
         global_config::set_dao_admin(&dao_admin, @test_coin_admin);
     }
 
     #[test(dao_admin = @dao_admin)]
-    #[expected_failure(abort_code = 301)]
+    #[expected_failure(abort_code = global_config::ERR_NOT_ADMIN)]
     fun test_set_dao_admin_fail_if_user_is_not_dao_admin(dao_admin: signer) {
         global_config::initialize_for_test();
 
@@ -60,19 +61,19 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_get_emergency_admin_fail_if_config_is_not_initialized() {
         global_config::get_emergency_admin();
     }
 
     #[test(emergency_admin = @emergency_admin)]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_set_emergency_admin_fail_if_config_is_not_initialized(emergency_admin: signer) {
         global_config::set_emergency_admin(&emergency_admin, @test_coin_admin);
     }
 
     #[test(emergency_admin = @emergency_admin)]
-    #[expected_failure(abort_code = 301)]
+    #[expected_failure(abort_code = global_config::ERR_NOT_ADMIN)]
     fun test_set_emergency_admin_fail_if_user_is_not_emergency_admin(emergency_admin: signer) {
         global_config::initialize_for_test();
 
@@ -96,19 +97,19 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_get_fee_admin_fail_if_config_is_not_initialized() {
         global_config::get_fee_admin();
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_set_fee_admin_fail_if_config_is_not_initialized(fee_admin: signer) {
         global_config::set_fee_admin(&fee_admin, @test_coin_admin);
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 301)]
+    #[expected_failure(abort_code = global_config::ERR_NOT_ADMIN)]
     fun test_set_fee_admin_fail_if_user_is_not_fee_admin(fee_admin: signer) {
         global_config::initialize_for_test();
 
@@ -136,31 +137,31 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_get_default_fee_fail_if_config_is_not_initialized() {
         global_config::get_default_fee<Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_get_default_dao_fee_fail_if_config_is_not_initialized() {
         global_config::get_default_dao_fee();
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_set_default_fee_fail_if_config_is_not_initialized(fee_admin: signer) {
         global_config::set_default_fee<Uncorrelated>(&fee_admin, 20);
     }
 
     #[test(dao_admin = @dao_admin)]
-    #[expected_failure(abort_code = 300)]
+    #[expected_failure(abort_code = global_config::ERR_CONFIG_DOES_NOT_EXIST)]
     fun test_set_default_dao_fee_fail_if_config_is_not_initialized(dao_admin: signer) {
         global_config::set_default_dao_fee(&dao_admin, 20);
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 301)]
+    #[expected_failure(abort_code = global_config::ERR_NOT_ADMIN)]
     fun test_set_default_fee_fail_if_user_is_not_fee_admin(fee_admin: signer) {
         global_config::initialize_for_test();
 
@@ -171,7 +172,7 @@ module liquidswap::global_config_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 301)]
+    #[expected_failure(abort_code = global_config::ERR_NOT_ADMIN)]
     fun test_set_default_dao_fee_fail_if_user_is_not_fee_admin(fee_admin: signer) {
         global_config::initialize_for_test();
 
@@ -182,7 +183,7 @@ module liquidswap::global_config_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 302)]
+    #[expected_failure(abort_code = global_config::ERR_INVALID_FEE)]
     fun test_set_default_fee_fail_if_invalid_amount_of_fee(fee_admin: signer) {
         global_config::initialize_for_test();
 
@@ -190,7 +191,7 @@ module liquidswap::global_config_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 302)]
+    #[expected_failure(abort_code = global_config::ERR_INVALID_FEE)]
     fun test_set_default_dao_fee_fail_if_invalid_amount_of_fee(fee_admin: signer) {
         global_config::initialize_for_test();
 
@@ -198,7 +199,7 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 10001)]
+    #[expected_failure(abort_code = curves::ERR_INVALID_CURVE)]
     fun test_cannot_set_default_fee_for_invalid_curve() {
         global_config::initialize_for_test();
 
@@ -207,7 +208,7 @@ module liquidswap::global_config_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 10001)]
+    #[expected_failure(abort_code = curves::ERR_INVALID_CURVE)]
     fun test_cannot_get_default_fee_for_invalid_curve() {
         global_config::initialize_for_test();
 
diff --git a/tests/liquidity_pool_tests.move b/tests/liquidity_pool_tests.move
index c2b0035..cae845e 100644
--- a/tests/liquidity_pool_tests.move
+++ b/tests/liquidity_pool_tests.move
@@ -14,6 +14,8 @@ module liquidswap::liquidity_pool_tests {
     use liquidswap::emergency;
     use liquidswap::global_config;
     use liquidswap::liquidity_pool;
+    use liquidswap::curves;
+    use liquidswap::coin_helper;
     use test_coin_admin::test_coins::{Self, USDT, BTC, USDC};
     use test_helpers::test_pool::{Self, initialize_liquidity_pool, create_liquidswap_admin};
 
@@ -85,7 +87,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_create_pool_emergency_fails(emergency_acc: signer) {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -133,7 +135,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_fail_if_coin_generics_provided_in_the_wrong_order() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -147,7 +149,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3001)]
+    #[expected_failure(abort_code = coin_helper::ERR_IS_NOT_COIN)]
     fun test_fail_if_x_is_not_coin() {
         let (coin_admin, lp_owner) = test_pool::create_coin_admin_and_lp_owner();
 
@@ -159,7 +161,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3001)]
+    #[expected_failure(abort_code = coin_helper::ERR_IS_NOT_COIN)]
     fun test_fail_if_y_is_not_coin() {
         let (coin_admin, lp_owner) = test_pool::create_coin_admin_and_lp_owner();
 
@@ -171,7 +173,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 101)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_EXISTS_FOR_PAIR)]
     fun test_fail_if_pool_already_exists() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -182,7 +184,7 @@ module liquidswap::liquidity_pool_tests {
 
     // Add liquidity tests.
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_fail_if_pool_for_this_pair_does_not_exist() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -223,7 +225,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 102)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ENOUGH_INITIAL_LIQUIDITY)]
     fun test_add_liquidity_less_than_minimal() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -236,7 +238,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 102)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ENOUGH_INITIAL_LIQUIDITY)]
     fun test_fail_if_adding_zero_liquidity_initially() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -270,7 +272,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_add_liquidity_emergency_stop_fails(emergency_acc: signer) {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -335,7 +337,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 103)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ENOUGH_LIQUIDITY)]
     fun test_add_liquidity_zero_for_pool_with_existing_liquidity() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -355,7 +357,7 @@ module liquidswap::liquidity_pool_tests {
 
     // Test burn liquidity.
     #[test]
-    #[expected_failure(abort_code = 106)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_BURN_VALUES)]
     fun test_fail_if_trying_to_burn_zero_values() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -534,7 +536,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_swap_coins_emergency_fails(emergency_acc: signer) {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -631,7 +633,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_1_fail() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -653,7 +655,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 104)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_EMPTY_COIN_IN)]
     fun test_swap_coins_zero_fail() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -698,7 +700,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_vice_versa_fail() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -748,7 +750,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_two_coins_failure() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -777,7 +779,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_cannot_swap_coins_and_reduce_value_of_pool() {
         let (coin_admin, lp_owner) = setup_btc_usdt_pool();
 
@@ -923,7 +925,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_with_stable_curve_type_1_unit_fail() {
         let (coin_admin, lp_owner) = setup_usdc_usdt_pool();
 
@@ -949,7 +951,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_with_stable_curve_type_fails() {
         let (coin_admin, lp_owner) = setup_usdc_usdt_pool();
 
@@ -1030,7 +1032,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_two_coins_with_stable_curve_fail() {
         let (coin_admin, lp_owner) = setup_usdc_usdt_pool();
         
@@ -1081,7 +1083,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coins_with_stable_curve_type_vice_versa_fail() {
         let (coin_admin, lp_owner) = setup_usdc_usdt_pool();
 
@@ -1109,7 +1111,7 @@ module liquidswap::liquidity_pool_tests {
     // Getters.
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_get_reserves_emergency_fails(emergency_acc: signer) {
         let (_, _) = setup_btc_usdt_pool();
 
@@ -1119,7 +1121,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(emergency_acc = @emergency_admin)]
-    #[expected_failure(abort_code = 4001)]
+    #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_get_cumulative_price_emergency_fails(emergency_acc: signer) {
         let (_, _) = setup_btc_usdt_pool();
 
@@ -1460,7 +1462,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_uncorrelated_fails_equal() {
         let x_res = 0;
         let y_res = 0;
@@ -1478,7 +1480,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_uncorrelated_fails_equal_1() {
         let x_res = 18446744073709551615;
         let y_res = 18446744073709551615;
@@ -1496,7 +1498,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_uncorrelated_fails_equal_2() {
         let x_res = 18446744073709551615;
         let y_res = 1;
@@ -1514,7 +1516,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_uncorrelated_fails_less() {
         let x_res = 100;
         let y_res = 99;
@@ -1532,7 +1534,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_uncorrelated_fails_less_1() {
         let x_res = 18446744073709551615;
         let y_res = 10;
@@ -1609,7 +1611,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_stable_less_fails() {
         let x_res = 10000;
         let y_res = 100;
@@ -1627,7 +1629,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_stable_less_fails_1() {
         let x_res = 10000;
         let y_res = 10;
@@ -1645,7 +1647,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_stable_equal_fails() {
         let x_res = 1000000001;
         let y_res = 100;
@@ -1663,7 +1665,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_compute_lp_stable_equal_fails_1() {
         let x_res = 0;
         let y_res = 0;
@@ -1822,7 +1824,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 10001)]
+    #[expected_failure(abort_code = curves::ERR_INVALID_CURVE)]
     fun test_fail_if_invalid_curve_is_passed() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -1830,7 +1832,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 109)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ENOUGH_PERMISSIONS_TO_INITIALIZE)]
     fun test_cannot_initialize_pool_with_non_admin_account() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -1838,7 +1840,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_get_fee_fail_if_pair_is_not_sorted() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1846,13 +1848,13 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_fee_fail_if_pool_does_not_exists() {
         let _ = liquidity_pool::get_fee<BTC, USDT, Uncorrelated>();
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_set_fee_fail_if_pair_is_not_sorted(fee_admin: signer) {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1860,13 +1862,13 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_set_fee_fail_if_pool_does_not_exists(fee_admin: signer) {
         liquidity_pool::set_fee<BTC, USDT, Uncorrelated>(&fee_admin, 10);
     }
 
     #[test]
-    #[expected_failure(abort_code = 112)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ADMIN)]
     fun test_set_fee_fail_if_user_is_not_admin() {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1874,7 +1876,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 302)]
+    #[expected_failure(abort_code = global_config::ERR_INVALID_FEE)]
     fun test_set_fee_fail_if_invalid_amount_of_fee(fee_admin: signer) {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1882,7 +1884,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_get_dao_fee_fail_if_pair_is_not_sorted() {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1890,13 +1892,13 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fee_fail_if_pool_does_not_exists() {
         let _ = liquidity_pool::get_dao_fee<BTC, USDT, Uncorrelated>();
     }
 
     #[test(dao_admin = @dao_admin)]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_set_dao_fee_fail_if_pair_is_not_sorted(dao_admin: signer) {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1904,13 +1906,13 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(dao_admin = @dao_admin)]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_set_dao_fee_fail_if_pool_does_not_exists(dao_admin: signer) {
         liquidity_pool::set_dao_fee<BTC, USDT, Uncorrelated>(&dao_admin, 10);
     }
 
     #[test]
-    #[expected_failure(abort_code = 112)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_NOT_ADMIN)]
     fun test_set_dao_fee_fail_if_user_is_not_admin() {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1918,7 +1920,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test(fee_admin = @fee_admin)]
-    #[expected_failure(abort_code = 302)]
+    #[expected_failure(abort_code = global_config::ERR_INVALID_FEE)]
     fun test_set_dao_fee_fail_if_invalid_amount_of_fee(fee_admin: signer) {
         let (_, lp_owner) = test_pool::setup_coins_and_lp_owner();
         liquidity_pool::register<BTC, USDT, Uncorrelated>(&lp_owner);
@@ -1926,7 +1928,7 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_cannot_fetch_fees_config_with_unsorted_generics() {
         let (_, _) = setup_btc_usdt_pool();
         let (_, _) = liquidity_pool::get_fees_config<USDT, BTC, Uncorrelated>();
@@ -2033,20 +2035,20 @@ module liquidswap::liquidity_pool_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code=107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fees_config_fail_doesnt_exists() {
         let (_fee, _d) = liquidity_pool::get_dao_fees_config<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code=100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_get_dao_fees_config_fails_wrong_ordering() {
         let (_, _) = setup_btc_usdt_pool();
         let (_fee, _d) = liquidity_pool::get_dao_fees_config<USDT, BTC, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code=100)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_WRONG_PAIR_ORDERING)]
     fun test_get_fees_config_fails_wrong_ordering() {
         let (_, _) = setup_btc_usdt_pool();
         let (_fee, _d) = liquidity_pool::get_dao_fees_config<USDT, BTC, Uncorrelated>();
diff --git a/tests/math_tests.move b/tests/math_tests.move
index 581efcc..502589a 100644
--- a/tests/math_tests.move
+++ b/tests/math_tests.move
@@ -27,13 +27,13 @@ module liquidswap::math_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 2000)]
+    #[expected_failure(abort_code = math::ERR_DIVIDE_BY_ZERO)]
     fun test_mul_div_zero() {
         let _ = math::mul_div(10, 20, 0);
     }
 
     #[test]
-    #[expected_failure(abort_code = 2000)]
+    #[expected_failure(abort_code = math::ERR_DIVIDE_BY_ZERO)]
     fun test_mul_div_u128_zero() {
         let _ = math::mul_div_u128(10, 20, 0);
     }
diff --git a/tests/router_tests.move b/tests/router_tests.move
index 957a9f6..0e535a7 100644
--- a/tests/router_tests.move
+++ b/tests/router_tests.move
@@ -110,7 +110,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 208)]
+    #[expected_failure(abort_code = router::ERR_WRONG_COIN_ORDER)]
     fun test_cannot_add_liquidity_to_pool_in_reverse_order() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -133,7 +133,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 203)]
+    #[expected_failure(abort_code = router::ERR_INSUFFICIENT_X_AMOUNT)]
     fun test_add_liquidity_to_fail_with_insufficient_x_coins() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(0, 0);
 
@@ -153,7 +153,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_add_liquidity_to_fail_with_insufficient_y_coins() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(0, 0);
 
@@ -204,7 +204,7 @@ module liquidswap::router_tests {
     //  (it's checked with generic params, so I don't know)
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_remove_liquidity_to_fail_if_less_than_minimum_x() {
         let (_, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -223,7 +223,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_remove_liquidity_to_fail_if_less_than_minimum_y() {
         let (_, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -310,7 +310,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_swap_exact_coin_for_coin_to_fail_if_less_than_minimum_out() {
         let (coin_admin, _) = register_pool_with_liquidity(101, 10100);
 
@@ -389,7 +389,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 206)]
+    #[expected_failure(abort_code = router::ERR_COIN_VAL_MAX_LESS_THAN_NEEDED)]
     fun test_swap_coin_for_exact_coin_router_check_fails() {
         let (coin_admin, _) = register_pool_with_liquidity(10000000000, 2800000000000);
 
@@ -430,7 +430,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 205)]
+    #[expected_failure(abort_code = router::ERR_COIN_OUT_NUM_LESS_THAN_EXPECTED_MINIMUM)]
     fun test_fail_if_price_fell_behind_threshold() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -448,7 +448,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 104)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_EMPTY_COIN_IN)]
     fun test_fail_if_swap_zero_coin() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -934,19 +934,19 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 200)]
+    #[expected_failure(abort_code = router::ERR_WRONG_AMOUNT)]
     fun test_fail_convert_with_current_price_coin_in_val() {
         router::convert_with_current_price(0, 1, 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 201)]
+    #[expected_failure(abort_code = router::ERR_WRONG_RESERVE)]
     fun test_fail_convert_with_current_price_reserve_in_size() {
         router::convert_with_current_price(1, 0, 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 201)]
+    #[expected_failure(abort_code = router::ERR_WRONG_RESERVE)]
     fun test_fail_convert_with_current_price_reserve_out_size() {
         router::convert_with_current_price(1, 1, 0);
     }
@@ -1077,7 +1077,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_fail_if_price_fell_behind_threshold_unchecked() {
         let (coin_admin, lp_owner) = register_pool_with_liquidity(101, 10100);
 
@@ -1095,7 +1095,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1113,7 +1113,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked_1() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1131,7 +1131,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_stable_fail_if_price_fell_behind_threshold_unchecked_2() {
         let (coin_admin, _) = register_stable_pool_with_liquidity(150000000, 15000000000);
 
@@ -1149,7 +1149,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     fun test_swap_coin_for_coin_unchecked_fails() {
         let (coin_admin, _) = register_pool_with_liquidity(10000000000, 2800000000000);
 
@@ -1185,7 +1185,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 203)]
+    #[expected_failure(abort_code = router::ERR_INSUFFICIENT_X_AMOUNT)]
     fun test_calc_optimal_coin_values_1() {
         // 100 BTC, 2,800,000 USDT
         let (_, _) = register_pool_with_liquidity(10000000000, 2800000000000);
@@ -1215,7 +1215,7 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 202)]
+    #[expected_failure(abort_code = router::ERR_INSUFFICIENT_Y_AMOUNT)]
     fun test_calc_optimal_coin_values_4() {
         // 100 BTC, 28000 USDT
         let (_, _) = register_pool_with_liquidity(10000000000, 28000000000);
@@ -1286,25 +1286,25 @@ module liquidswap::router_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_fees_config_fail_if_pool_does_not_exists() {
         router::get_fees_config<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_fee_fail_if_pool_does_not_exists() {
         router::get_fee<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fees_config_fail_if_pool_does_not_exists() {
         router::get_dao_fees_config<BTC, USDT, Uncorrelated>();
     }
 
     #[test]
-    #[expected_failure(abort_code = 107)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_POOL_DOES_NOT_EXIST)]
     fun test_get_dao_fee_fail_if_pool_does_not_exists() {
         router::get_dao_fee<BTC, USDT, Uncorrelated>();
     }
diff --git a/tests/scripts_tests.move b/tests/scripts_tests.move
index a08c628..87c5926 100644
--- a/tests/scripts_tests.move
+++ b/tests/scripts_tests.move
@@ -217,7 +217,7 @@ module liquidswap::scripts_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 105)]
+    #[expected_failure(abort_code = liquidity_pool::ERR_INCORRECT_SWAP)]
     public entry fun test_unchecked_swap_fails_if_price_better_than_available_requested() {
         let (coin_admin, lp_owner) = register_pool_with_existing_liquidity(101, 10100);