diff --git a/src/ScriptTests/Moves/Absorb.cpp b/src/ScriptTests/Moves/AMoves/Absorb.cpp
similarity index 92%
rename from src/ScriptTests/Moves/Absorb.cpp
rename to src/ScriptTests/Moves/AMoves/Absorb.cpp
index 6f24bb1..256e328 100644
--- a/src/ScriptTests/Moves/Absorb.cpp
+++ b/src/ScriptTests/Moves/AMoves/Absorb.cpp
@@ -1,8 +1,8 @@
 #include <CreatureLib/Battling/Models/ExecutingAttack.hpp>
-#include <PkmnLib/Battling/Pokemon/CreatePokemon.hpp>
 #include <PkmnLib/Battling/Battle/Battle.hpp>
-#include "../../../extern/catch.hpp"
-#include "../Macros/MoveMacros.hpp"
+#include <PkmnLib/Battling/Pokemon/CreatePokemon.hpp>
+#include "../../../../extern/catch.hpp"
+#include "../../Macros/MoveMacros.hpp"
 
 TEST_CASE("Absorb - Heals on use", "[moves]") {
     SETUP_MOVE_TEST(Absorb)
diff --git a/src/ScriptTests/Moves/Acid.cpp b/src/ScriptTests/Moves/AMoves/Acid.cpp
similarity index 84%
rename from src/ScriptTests/Moves/Acid.cpp
rename to src/ScriptTests/Moves/AMoves/Acid.cpp
index 64ff8b2..61d69e9 100644
--- a/src/ScriptTests/Moves/Acid.cpp
+++ b/src/ScriptTests/Moves/AMoves/Acid.cpp
@@ -1,4 +1,4 @@
-#include "../Macros/MoveMacros.hpp"
+#include "../../Macros/MoveMacros.hpp"
 
 using Stats = PkmnLib::Library::Statistic;
 
diff --git a/src/ScriptTests/Moves/AcidArmor.cpp b/src/ScriptTests/Moves/AMoves/AcidArmor.cpp
similarity index 89%
rename from src/ScriptTests/Moves/AcidArmor.cpp
rename to src/ScriptTests/Moves/AMoves/AcidArmor.cpp
index 8c5829a..8df45c3 100644
--- a/src/ScriptTests/Moves/AcidArmor.cpp
+++ b/src/ScriptTests/Moves/AMoves/AcidArmor.cpp
@@ -1,4 +1,4 @@
-#include "../Macros/MoveMacros.hpp"
+#include "../../Macros/MoveMacros.hpp"
 using Stats = PkmnLib::Library::Statistic;
 
 TEST_CASE("AcidArmor - Increases defense by 2", "[moves]") {
diff --git a/src/ScriptTests/Moves/AMoves/AcidSpray.cpp b/src/ScriptTests/Moves/AMoves/AcidSpray.cpp
new file mode 100644
index 0000000..5e42683
--- /dev/null
+++ b/src/ScriptTests/Moves/AMoves/AcidSpray.cpp
@@ -0,0 +1,12 @@
+#include "../../Macros/MoveMacros.hpp"
+using Stats = PkmnLib::Library::Statistic;
+
+TEST_CASE("AcidSpray - Increases defense by 2", "[moves]") {
+    SETUP_MOVE_TEST(Acid_Spray)
+
+    CHECK(userMon->GetStatBoost(Stats::SpecialDefense) == 0);
+    script->OnSecondaryEffect(executingMove, userMon, 0);
+    CHECK(userMon->GetStatBoost(Stats::SpecialDefense) == -2);
+
+    CLEANUP_MOVE_TEST
+}