diff --git a/src/main/java/fr/xephi/authme/process/ProcessService.java b/src/main/java/fr/xephi/authme/process/ProcessService.java
index 81c241d5d..7f696fe1d 100644
--- a/src/main/java/fr/xephi/authme/process/ProcessService.java
+++ b/src/main/java/fr/xephi/authme/process/ProcessService.java
@@ -42,66 +42,159 @@ public class ProcessService {
         this.spawnLoader = spawnLoader;
     }
 
+    /**
+     * Retrieve a property's value.
+     *
+     * @param property the property to retrieve
+     * @param <T> the property type
+     * @return the property's value
+     */
     public <T> T getProperty(Property<T> property) {
         return settings.getProperty(property);
     }
 
+    /**
+     * Return the settings manager.
+     *
+     * @return settings manager
+     */
     public NewSetting getSettings() {
         return settings;
     }
 
+    /**
+     * Send a message to the command sender.
+     *
+     * @param sender the command sender
+     * @param key the message key
+     */
     public void send(CommandSender sender, MessageKey key) {
         messages.send(sender, key);
     }
 
+    /**
+     * Send a message to the command sender with the given replacements.
+     *
+     * @param sender the command sender
+     * @param key the message key
+     * @param replacements the replacements to apply to the message
+     */
     public void send(CommandSender sender, MessageKey key, String... replacements) {
         messages.send(sender, key, replacements);
     }
 
+    /**
+     * Retrieve a message.
+     *
+     * @param key the key of the message
+     * @return the message, split by line
+     */
     public String[] retrieveMessage(MessageKey key) {
         return messages.retrieve(key);
     }
 
+    /**
+     * Retrieve a message as one piece.
+     *
+     * @param key the key of the message
+     * @return the message
+     */
     public String retrieveSingleMessage(MessageKey key) {
         return messages.retrieveSingle(key);
     }
 
+    /**
+     * Run a task.
+     *
+     * @param task the task to run
+     * @return the assigned task id
+     */
     public BukkitTask runTask(Runnable task) {
         return authMe.getServer().getScheduler().runTask(authMe, task);
     }
 
+    /**
+     * Run a task at a later time.
+     *
+     * @param task the task to run
+     * @param delay the delay before running the task
+     * @return the assigned task id
+     */
     public BukkitTask runTaskLater(Runnable task, long delay) {
         return authMe.getServer().getScheduler().runTaskLater(authMe, task, delay);
     }
 
+    /**
+     * Schedule a synchronous delayed task.
+     *
+     * @param task the task to schedule
+     * @return the task id
+     */
     public int scheduleSyncDelayedTask(Runnable task) {
         return authMe.getServer().getScheduler().scheduleSyncDelayedTask(authMe, task);
     }
 
+    /**
+     * Emit an event.
+     *
+     * @param event the event to emit
+     */
     public void callEvent(Event event) {
         authMe.getServer().getPluginManager().callEvent(event);
     }
 
+    /**
+     * Return the plugin instance.
+     *
+     * @return AuthMe instance
+     */
     public AuthMe getAuthMe() {
         return authMe;
     }
 
+    /**
+     * Return the IP address manager.
+     *
+     * @return the ip address manager
+     */
     public IpAddressManager getIpAddressManager() {
         return ipAddressManager;
     }
 
+    /**
+     * Compute the hash for the given password.
+     *
+     * @param password the password to hash
+     * @param username the user to hash for
+     * @return the resulting hash
+     */
     public HashedPassword computeHash(String password, String username) {
         return passwordSecurity.computeHash(password, username);
     }
 
+    /**
+     * Return the PluginHooks manager.
+     *
+     * @return PluginHooks instance
+     */
     public PluginHooks getPluginHooks() {
         return pluginHooks;
     }
 
+    /**
+     * Return the spawn manager.
+     *
+     * @return SpawnLoader instance
+     */
     public SpawnLoader getSpawnLoader() {
         return spawnLoader;
     }
 
+    /**
+     * Return the plugin's datasource.
+     *
+     * @return the datasource
+     */
     public DataSource getDataSource() {
         return dataSource;
     }
diff --git a/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java b/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java
new file mode 100644
index 000000000..da3c2f8d9
--- /dev/null
+++ b/src/test/java/fr/xephi/authme/process/ProcessServiceTest.java
@@ -0,0 +1,202 @@
+package fr.xephi.authme.process;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.IpAddressManager;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.hooks.PluginHooks;
+import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.output.Messages;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.security.crypts.HashedPassword;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.SpawnLoader;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.command.CommandSender;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Test for {@link ProcessService}.
+ */
+public class ProcessServiceTest {
+
+    private ProcessService processService;
+    private Map<Class<?>, Object> mocks;
+
+    @Before
+    public void setUpService() {
+        mocks = new HashMap<>();
+        processService = new ProcessService(newMock(NewSetting.class), newMock(Messages.class), newMock(AuthMe.class),
+            newMock(DataSource.class), newMock(IpAddressManager.class), newMock(PasswordSecurity.class),
+            newMock(PluginHooks.class), newMock(SpawnLoader.class));
+    }
+
+    @Test
+    public void shouldGetProperty() {
+        // given
+        NewSetting settings = getMock(NewSetting.class);
+        given(settings.getProperty(SecuritySettings.CAPTCHA_LENGTH)).willReturn(8);
+
+        // when
+        int result = processService.getProperty(SecuritySettings.CAPTCHA_LENGTH);
+
+        // then
+        verify(settings).getProperty(SecuritySettings.CAPTCHA_LENGTH);
+        assertThat(result, equalTo(8));
+    }
+
+    @Test
+    public void shouldReturnSettings() {
+        // given/when
+        NewSetting settings = processService.getSettings();
+
+        // then
+        assertThat(settings, equalTo(getMock(NewSetting.class)));
+    }
+
+    @Test
+    public void shouldSendMessageToPlayer() {
+        // given
+        Messages messages = getMock(Messages.class);
+        CommandSender sender = mock(CommandSender.class);
+        MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
+
+        // when
+        processService.send(sender, key);
+
+        // then
+        verify(messages).send(sender, key);
+    }
+
+    @Test
+    public void shouldSendMessageWithReplacements() {
+        // given
+        Messages messages = getMock(Messages.class);
+        CommandSender sender = mock(CommandSender.class);
+        MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
+        String[] replacements = new String[]{"test", "toast"};
+
+        // when
+        processService.send(sender, key, replacements);
+
+        // then
+        verify(messages).send(sender, key, replacements);
+    }
+
+    @Test
+    public void shouldRetrieveMessage() {
+        // given
+        Messages messages = getMock(Messages.class);
+        MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
+        String[] lines = new String[]{"First message line", "second line"};
+        given(messages.retrieve(key)).willReturn(lines);
+
+        // when
+        String[] result = processService.retrieveMessage(key);
+
+        // then
+        assertThat(result, equalTo(lines));
+        verify(messages).retrieve(key);
+    }
+
+    @Test
+    public void shouldRetrieveSingleMessage() {
+        // given
+        Messages messages = getMock(Messages.class);
+        MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
+        String text = "Test text";
+        given(messages.retrieveSingle(key)).willReturn(text);
+
+        // when
+        String result = processService.retrieveSingleMessage(key);
+
+        // then
+        assertThat(result, equalTo(text));
+        verify(messages).retrieveSingle(key);
+    }
+
+    @Test
+    public void shouldReturnAuthMeInstance() {
+        // given / when
+        AuthMe authMe = processService.getAuthMe();
+
+        // then
+        assertThat(authMe, equalTo(getMock(AuthMe.class)));
+    }
+
+    @Test
+    public void shouldReturnPluginHooks() {
+        // given / when
+        PluginHooks pluginHooks = processService.getPluginHooks();
+
+        // then
+        assertThat(pluginHooks, equalTo(getMock(PluginHooks.class)));
+    }
+
+    @Test
+    public void shouldReturnIpAddressManager() {
+        // given / when
+        IpAddressManager ipAddressManager = processService.getIpAddressManager();
+
+        // then
+        assertThat(ipAddressManager, equalTo(getMock(IpAddressManager.class)));
+    }
+
+    @Test
+    public void shouldReturnSpawnLoader() {
+        // given / when
+        SpawnLoader spawnLoader = processService.getSpawnLoader();
+
+        // then
+        assertThat(spawnLoader, equalTo(getMock(SpawnLoader.class)));
+    }
+
+    @Test
+    public void shouldReturnDatasource() {
+        // given / when
+        DataSource dataSource = processService.getDataSource();
+
+        // then
+        assertThat(dataSource, equalTo(getMock(DataSource.class)));
+    }
+
+    @Test
+    public void shouldComputeHash() {
+        // given
+        PasswordSecurity passwordSecurity = getMock(PasswordSecurity.class);
+        String password = "test123";
+        String username = "Username";
+        HashedPassword hashedPassword = new HashedPassword("hashedResult", "salt12342");
+        given(passwordSecurity.computeHash(password, username)).willReturn(hashedPassword);
+
+        // when
+        HashedPassword result = processService.computeHash(password, username);
+
+        // then
+        assertThat(result, equalTo(hashedPassword));
+        verify(passwordSecurity).computeHash(password, username);
+    }
+
+    private <T> T newMock(Class<T> clazz) {
+        T mock = mock(clazz);
+        mocks.put(clazz, mock);
+        return mock;
+    }
+
+    private <T> T getMock(Class<T> clazz) {
+        Object mock = mocks.get(clazz);
+        if (mock == null) {
+            throw new IllegalArgumentException("No mock of type " + clazz);
+        }
+        return clazz.cast(mock);
+    }
+}