diff --git a/Changelog b/Changelog
index 2b99c80aa..dc5029b8c 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-07-26 DariusIII
+	* Chg: Update tests
 	* Chg: Update CreatesApplication class
 	* Chg: Add missing tests
 	* Chg: Update releases date handling in RSS and API operations
diff --git a/composer.json b/composer.json
index 8db1fb217..72c204521 100755
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,11 @@
       "database/seeds"
     ]
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
   "config": {
     "discard-changes": true,
     "process-timeout": 3600,
diff --git a/phpunit.xml b/phpunit.xml
index bb4fe8c1a..c493656e6 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,8 +8,9 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
-    <testsuite name="Installation Test">
+    <testsuite name="Tests">
         <directory suffix="Test.php">./tests/Install</directory>
+        <directory suffix="Test.php">./tests/Feature</directory>
     </testsuite>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
diff --git a/tests/Feature/GetBooksBrowseByOptionsTest.php b/tests/Feature/GetBooksBrowseByOptionsTest.php
new file mode 100644
index 000000000..f233069b8
--- /dev/null
+++ b/tests/Feature/GetBooksBrowseByOptionsTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Feature;
+
+use Blacklight\Books;
+use Tests\TestCase;
+
+class GetBooksBrowseByOptionsTest extends TestCase
+{
+    /**
+     * @throws \Exception
+     */
+    public function testBookBrowseByTest()
+    {
+        $books = (new Books())->getBrowseByOptions();
+        $this->assertArrayHasKey('author', $books);
+    }
+}