diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
index a647390dc..6658c3b69 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
@@ -240,6 +240,11 @@ public final class SlimefunRegistry {
         return researchFireworks;
     }
 
+    /**
+     * Returns whether the research learning animations is disabled
+     *
+     * @return Whether the research learning animations is disabled
+     */
     public boolean isLearningAnimationDisabled() {
         return disableLearningAnimation;
     }
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java
index 1ffd31d63..fd4a02260 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java
@@ -1,28 +1,34 @@
 package io.github.thebusybiscuit.slimefun4.core.guide.options;
 
-import io.github.thebusybiscuit.cscorelib2.data.PersistentDataAPI;
-import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
-import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.Optional;
+import io.github.thebusybiscuit.cscorelib2.data.PersistentDataAPI;
+import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
+import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
+import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
 
 public class LearningAnimationOption implements SlimefunGuideOption<Boolean> {
 
+    @Nonnull
     @Override
     public SlimefunAddon getAddon() {
         return SlimefunPlugin.instance();
     }
 
+    @Nonnull
     @Override
     public NamespacedKey getKey() {
         return new NamespacedKey(SlimefunPlugin.instance(), "research_learning_animation");
     }
 
+    @Nonnull
     @Override
     public Optional<ItemStack> getDisplayItem(Player p, ItemStack guide) {
         if (SlimefunPlugin.getRegistry().isLearningAnimationDisabled()) {
@@ -35,20 +41,20 @@ public class LearningAnimationOption implements SlimefunGuideOption<Boolean> {
     }
 
     @Override
-    public void onClick(Player p, ItemStack guide) {
+    public void onClick(@Nonnull Player p, @Nonnull ItemStack guide) {
         setSelectedOption(p, guide, !getSelectedOption(p, guide).orElse(true));
         SlimefunGuideSettings.openSettings(p, guide);
     }
 
     @Override
-    public Optional<Boolean> getSelectedOption(Player p, ItemStack guide) {
+    public Optional<Boolean> getSelectedOption(@Nonnull Player p, @Nonnull ItemStack guide) {
         NamespacedKey key = getKey();
         boolean value = !PersistentDataAPI.hasByte(p, key) || PersistentDataAPI.getByte(p, key) == (byte) 1;
         return Optional.of(value);
     }
 
     @Override
-    public void setSelectedOption(Player p, ItemStack guide, Boolean value) {
+    public void setSelectedOption(@Nonnull Player p, @Nonnull ItemStack guide, @Nonnull Boolean value) {
         PersistentDataAPI.setByte(p, getKey(), (byte) (value ? 1 : 0));
     }
 
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/researches/TestResearchUnlocking.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/researches/TestResearchUnlocking.java
index dd017af4f..9f4f88bac 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/researches/TestResearchUnlocking.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/researches/TestResearchUnlocking.java
@@ -47,7 +47,7 @@ class TestResearchUnlocking {
             latch.countDown();
         });
 
-        latch.await(instant ? 1 : 10, TimeUnit.SECONDS);
+        latch.await(10, TimeUnit.SECONDS);
         return ref.get();
     }