diff --git a/src/API/Kitsu/Auth.php b/src/API/Kitsu/Auth.php
index c2c3789a..4f3c7d0a 100644
--- a/src/API/Kitsu/Auth.php
+++ b/src/API/Kitsu/Auth.php
@@ -36,14 +36,14 @@ class Auth {
 	/**
 	 * Anime API Model
 	 *
-	 * @var \Aviat\AnimeClient\API\Kitsu\Model
+	 * @var Model
 	 */
 	protected $model;
 
 	/**
 	 * Session object
 	 *
-	 * @var Aura\Session\Segment
+	 * @var \Aura\Session\Segment
 	 */
 	protected $segment;
 
diff --git a/src/API/MAL.php b/src/API/MAL.php
index 6efc83e2..872b4c63 100644
--- a/src/API/MAL.php
+++ b/src/API/MAL.php
@@ -73,7 +73,7 @@ class MAL {
 			'completed' => MangaReadingStatus::COMPLETED,
 			'onhold' => MangaReadingStatus::ON_HOLD,
 			'dropped' => MangaReadingStatus::DROPPED,
-			'plantoread' => MangaReadingStatus::PLAN_TO_WATCH
+			'plantoread' => MangaReadingStatus::PLAN_TO_READ
 		];
 	}
 }
\ No newline at end of file
diff --git a/src/API/MAL/Model.php b/src/API/MAL/Model.php
index be306d5a..c02bdee2 100644
--- a/src/API/MAL/Model.php
+++ b/src/API/MAL/Model.php
@@ -34,6 +34,11 @@ class Model {
 	 * @var AnimeListTransformer
 	 */
 	protected $animeListTransformer;
+	
+	/**
+	 * @var ListItem
+	 */
+	protected $listItem;
 
 	/**
 	 * MAL Model constructor.
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index dddffd9b..02296727 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -28,6 +28,18 @@ const NOT_FOUND_METHOD = 'notFound';
 const ERROR_MESSAGE_METHOD = 'errorPage';
 const SRC_DIR = SRC_DIR;
 
+/**
+ * Joins paths together. Variadic to take an
+ * arbitrary number of arguments
+ *
+ * @param string[] ...$args
+ * @return string
+ */
+function _dir(...$args)
+{
+	return implode(DIRECTORY_SEPARATOR, $args);
+}
+
 /**
  * Load configuration options from .toml files
  *
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index 2e2f36e1..f1712d55 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -72,7 +72,7 @@ class BaseCommand extends Command {
 		$config = loadToml($CONF_DIR);
 		$config_array = array_merge($base_config, $config);
 
-		$di = function ($config_array) use ($APP_DIR) {
+		$di = function ($config_array) {
 			$container = new Container();
 
 			// -------------------------------------------------------------------------
diff --git a/src/Command/SyncKitsuWithMal.php b/src/Command/SyncKitsuWithMal.php
index cdb5898d..e2a1f50d 100644
--- a/src/Command/SyncKitsuWithMal.php
+++ b/src/Command/SyncKitsuWithMal.php
@@ -31,13 +31,13 @@ class SyncKitsuWithMal extends BaseCommand {
 
 	/**
 	 * Model for making requests to Kitsu API
-	 * @var Aviat\AnimeClient\API\Kitsu
+	 * @var \Aviat\AnimeClient\API\Kitsu\Model
 	 */
 	protected $kitsuModel;
 	
 	/**
 	 * Model for making requests to MAL API
-	 * @var Aviat\AnimeClient\API\MAL
+	 * @var \Aviat\AnimeClient\API\MAL\Model
 	 */
 	protected $malModel;
 
diff --git a/src/Controller.php b/src/Controller.php
index 55400209..00c260ad 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -18,6 +18,8 @@ namespace Aviat\AnimeClient;
 
 use const Aviat\AnimeClient\SESSION_SEGMENT;
 
+use function Aviat\AnimeClient\_dir;
+
 use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
 use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
 use InvalidArgumentException;
@@ -33,13 +35,13 @@ class Controller {
 
 	/**
 	 * Cache manager
-	 * @var \Aviat\Ion\Cache\CacheInterface
+	 * @var \Psr\Cache\CacheItemPoolInterface
 	 */
 	protected $cache;
 
 	/**
 	 * The global configuration object
-	 * @var Aviat\Ion\ConfigInterface $config
+	 * @var \Aviat\Ion\ConfigInterface $config
 	 */
 	protected $config;
 
@@ -69,7 +71,7 @@ class Controller {
 
 	/**
 	 * Session segment
-	 * @var [type]
+	 * @var \Aura\Session\Segment
 	 */
 	protected $session;
 
@@ -307,7 +309,8 @@ class Controller {
 		$post = $this->request->getParsedBody();
 		if ($auth->authenticate($post['password']))
 		{
-			return $this->sessionRedirect();
+			$this->sessionRedirect();
+			return;
 		}
 
 		$this->setFlashMessage('Invalid username or password.');
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 814bf4b5..c13cdb7d 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -45,7 +45,7 @@ class Anime extends BaseController {
 
 	/**
 	 * Data cache
-	 * @var Aviat\Ion\Cache\CacheInterface
+	 * @var \Psr\Cache\CachePoolInterface
 	 */
 	protected $cache;
 
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 97c2e656..0c5d2b09 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -24,6 +24,8 @@ use const Aviat\AnimeClient\{
 	SRC_DIR
 };
 
+use function Aviat\AnimeClient\_dir;
+
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Friend;
 
@@ -46,7 +48,7 @@ class Dispatcher extends RoutingBase {
 
 	/**
 	 * Class wrapper for input superglobals
-	 * @var Psr\Http\Message\ServerRequestInterface
+	 * @var \Psr\Http\Message\ServerRequestInterface
 	 */
 	protected $request;
 
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index 440d3f8c..c263ca75 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -33,14 +33,14 @@ class MenuGenerator extends UrlGenerator {
 	/**
 	 * Html generation helper
 	 *
-	 * @var Aura\Html\HelperLocator
+	 * @var \Aura\Html\HelperLocator
 	 */
 	protected $helper;
 
 	/**
 	 * Request object
 	 *
-	 * @var Aura\Web\Request
+	 * @var \Aura\Web\Request
 	 */
 	protected $request;
 
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index b73d32d9..50a984fa 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -52,14 +52,14 @@ class Anime extends API {
 	/**
 	 * Model for making requests to Kitsu API
 	 *
-	 * @var Aviat\AnimeClient\API\Kitsu\Model
+	 * @var \Aviat\AnimeClient\API\Kitsu\Model
 	 */
 	protected $kitsuModel;
 
 	/**
 	 * Model for making requests to MAL API
 	 *
-	 * @var Aviat\AnimeClient\API\MAL\Model
+	 * @var \Aviat\AnimeClient\API\MAL\Model
 	 */
 	protected $malModel;
 
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index eaa31f5c..e1149d73 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -58,9 +58,15 @@ class Manga extends API
 
 	/**
 	 * Model for making requests to Kitsu API
-	 * @var Aviat\AnimeClient\API\Kitsu\KitsuModel
+	 * @var \Aviat\AnimeClient\API\Kitsu\Model
 	 */
 	protected $kitsuModel;
+	
+	/**
+	 * Model for making requests to MAL API
+	 * @var \Aviat\AnimeClient\API\MAL\Model
+	 */
+	protected $malModel;
 
 	/**
 	 * Constructor
@@ -70,6 +76,7 @@ class Manga extends API
 	public function __construct(ContainerInterface $container)
 	{
 		$this->kitsuModel = $container->get('kitsu-model');
+		$this->malModel = $container->get('mal-model');
 	}
 
 	/**
diff --git a/src/RoutingBase.php b/src/RoutingBase.php
index 16673107..5e9223bb 100644
--- a/src/RoutingBase.php
+++ b/src/RoutingBase.php
@@ -34,7 +34,7 @@ class RoutingBase {
 
 	/**
 	 * Config Object
-	 * @var Config
+	 * @var \Aviat\Ion\Config
 	 */
 	protected $config;
 
diff --git a/tests/API/JsonAPITest.php b/tests/API/JsonAPITest.php
index d7f5f2f4..bf27ee45 100644
--- a/tests/API/JsonAPITest.php
+++ b/tests/API/JsonAPITest.php
@@ -22,6 +22,10 @@ use PHPUnit\Framework\TestCase;
 
 class JsonAPITest extends TestCase {
 	
+	protected $startData;
+	protected $organizedIncludes;
+	protected $inlineIncluded;
+	
 	public function setUp()
 	{
 		$dir = __DIR__ . '/../test_data/JsonAPI';