diff --git a/lib/Discovery/Cms/Discovery.php b/lib/Discovery/Cms/Discovery.php
index 71d31d78..da606e82 100644
--- a/lib/Discovery/Cms/Discovery.php
+++ b/lib/Discovery/Cms/Discovery.php
@@ -11,6 +11,7 @@
  * @method Hubdb\Discovery        hubdb()
  * @method Performance\Discovery  performance()
  * @method SiteSearch\Discovery   siteSearch()
+ * @method SourceCode\Discovery   sourceCode()
  * @method UrlRedirects\Discovery urlRedirects()
  */
 class Discovery extends DiscoveryBase
diff --git a/lib/Discovery/Cms/SourceCode/Discovery.php b/lib/Discovery/Cms/SourceCode/Discovery.php
new file mode 100644
index 00000000..10d5d8bd
--- /dev/null
+++ b/lib/Discovery/Cms/SourceCode/Discovery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace HubSpot\Discovery\Cms\SourceCode;
+
+use HubSpot\Client\Cms\SourceCode\Api\ContentApi;
+use HubSpot\Client\Cms\SourceCode\Api\ExtractApi;
+use HubSpot\Client\Cms\SourceCode\Api\MetadataApi;
+use HubSpot\Client\Cms\SourceCode\Api\SourceCodeExtractApi;
+use HubSpot\Client\Cms\SourceCode\Api\ValidationApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method ContentApi           contentApi()
+ * @method ExtractApi           extractApi()
+ * @method MetadataApi          metadataApi()
+ * @method SourceCodeExtractApi sourceCodeExtractApi()
+ * @method ValidationApi        validationApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Crm/Objects/Calls/Discovery.php b/lib/Discovery/Crm/Objects/Calls/Discovery.php
new file mode 100644
index 00000000..8ffc0e30
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/Calls/Discovery.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\Calls;
+
+use HubSpot\Client\Crm\Objects\Calls\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method AssociationsApi associationsApi()
+ * @method BasicApi        basicApi()
+ * @method BatchApi        batchApi()
+ * @method SearchApi       searchApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Crm/Objects/Discovery.php b/lib/Discovery/Crm/Objects/Discovery.php
index 41b4ed39..672cd5b8 100644
--- a/lib/Discovery/Crm/Objects/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Discovery.php
@@ -13,9 +13,14 @@
  * @method AssociationsApi               associationsApi()
  * @method BasicApi                      basicApi()
  * @method BatchApi                      batchApi()
+ * @method Calls\Discovery               сalls()
  * @method GDPRApi                       gdprApi()
+ * @method Emails\Discovery              emails()
  * @method FeedbackSubmissions\Discovery feedbackSubmissions()
+ * @method Meetings\Discovery            meetings()
+ * @method Notes\Discovery               notes()
  * @method SearchApi                     searchApi()
+ * @method Tasks\Discovery               tasks()
  */
 class Discovery extends DiscoveryBase
 {
diff --git a/lib/Discovery/Crm/Objects/Emails/Discovery.php b/lib/Discovery/Crm/Objects/Emails/Discovery.php
new file mode 100644
index 00000000..fe939629
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/Emails/Discovery.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\Emails;
+
+use HubSpot\Client\Crm\Objects\Emails\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method AssociationsApi associationsApi()
+ * @method BasicApi        basicApi()
+ * @method BatchApi        batchApi()
+ * @method SearchApi       searchApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Crm/Objects/Meetings/Discovery.php b/lib/Discovery/Crm/Objects/Meetings/Discovery.php
new file mode 100644
index 00000000..2531df46
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/Meetings/Discovery.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\Meetings;
+
+use HubSpot\Client\Crm\Objects\Meetings\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method AssociationsApi associationsApi()
+ * @method BasicApi        basicApi()
+ * @method BatchApi        batchApi()
+ * @method SearchApi       searchApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Crm/Objects/Notes/Discovery.php b/lib/Discovery/Crm/Objects/Notes/Discovery.php
new file mode 100644
index 00000000..c2e8afdb
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/Notes/Discovery.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\Notes;
+
+use HubSpot\Client\Crm\Objects\Notes\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method AssociationsApi associationsApi()
+ * @method BasicApi        basicApi()
+ * @method BatchApi        batchApi()
+ * @method SearchApi       searchApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Crm/Objects/Tasks/Discovery.php b/lib/Discovery/Crm/Objects/Tasks/Discovery.php
new file mode 100644
index 00000000..9b03e5a6
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/Tasks/Discovery.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\Tasks;
+
+use HubSpot\Client\Crm\Objects\Tasks\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method AssociationsApi associationsApi()
+ * @method BasicApi        basicApi()
+ * @method BatchApi        batchApi()
+ * @method SearchApi       searchApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Discovery.php b/lib/Discovery/Discovery.php
index f8262718..fbbb9122 100644
--- a/lib/Discovery/Discovery.php
+++ b/lib/Discovery/Discovery.php
@@ -12,6 +12,7 @@
  * @method Events\Discovery                   events()
  * @method Files\Discovery                    files()
  * @method Marketing\Discovery                marketing()
+ * @method Settings\Discovery                 settings()
  * @method Webhooks\Discovery                 webhooks()
  */
 class Discovery extends DiscoveryBase
diff --git a/lib/Discovery/Marketing/Events/Discovery.php b/lib/Discovery/Marketing/Events/Discovery.php
new file mode 100644
index 00000000..ce435c44
--- /dev/null
+++ b/lib/Discovery/Marketing/Events/Discovery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace HubSpot\Discovery\Marketing\Events;
+
+use HubSpot\Client\Marketing\Events\Api\BasicApi;
+use HubSpot\Client\Marketing\Events\Api\BatchApi;
+use HubSpot\Client\Marketing\Events\Api\SearchApi;
+use HubSpot\Client\Marketing\Events\Api\SettingsApi;
+use HubSpot\Client\Marketing\Events\Api\SubscriberStateChangesApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method BasicApi                  basicApi()
+ * @method BatchApi                  batchApi()
+ * @method SearchApi                 searchApi()
+ * @method SettingsApi               settingsApi()
+ * @method SubscriberStateChangesApi subscriberStateChangesApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Settings/Discovery.php b/lib/Discovery/Settings/Discovery.php
new file mode 100644
index 00000000..56d1d4f1
--- /dev/null
+++ b/lib/Discovery/Settings/Discovery.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace HubSpot\Discovery\Settings;
+
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method Users\Discovery users()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/lib/Discovery/Settings/Users/Discovery.php b/lib/Discovery/Settings/Users/Discovery.php
new file mode 100644
index 00000000..2019e306
--- /dev/null
+++ b/lib/Discovery/Settings/Users/Discovery.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace HubSpot\Discovery\Settings\Users;
+
+use HubSpot\Client\Settings\Users\Api\RolesApi;
+use HubSpot\Client\Settings\Users\Api\TeamsApi;
+use HubSpot\Client\Settings\Users\Api\UsersApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method RolesApi rolesApi()
+ * @method TeamsApi teamsApi()
+ * @method UsersApi usersApi()
+ */
+class Discovery extends DiscoveryBase
+{
+}
diff --git a/tests/spec/Discovery/Cms/DiscoverySpec.php b/tests/spec/Discovery/Cms/DiscoverySpec.php
index 1df66e6e..94c3255a 100644
--- a/tests/spec/Discovery/Cms/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/DiscoverySpec.php
@@ -26,6 +26,7 @@ public function it_creates_clients()
         $this->hubdb()->shouldHaveType(\HubSpot\Discovery\Cms\Hubdb\Discovery::class);
         $this->performance()->shouldHaveType(\HubSpot\Discovery\Cms\Performance\Discovery::class);
         $this->siteSearch()->shouldHaveType(\HubSpot\Discovery\Cms\SiteSearch\Discovery::class);
+        $this->sourceCode()->shouldHaveType(\HubSpot\Discovery\Cms\SourceCode\Discovery::class);
         $this->urlRedirects()->shouldHaveType(\HubSpot\Discovery\Cms\UrlRedirects\Discovery::class);
     }
 }
diff --git a/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php b/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php
new file mode 100644
index 00000000..540d6562
--- /dev/null
+++ b/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Cms\SourceCode;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Cms\SourceCode\Api\ContentApi;
+use HubSpot\Client\Cms\SourceCode\Api\ExtractApi;
+use HubSpot\Client\Cms\SourceCode\Api\MetadataApi;
+use HubSpot\Client\Cms\SourceCode\Api\SourceCodeExtractApi;
+use HubSpot\Client\Cms\SourceCode\Api\ValidationApi;
+use HubSpot\Config;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(\HubSpot\Discovery\Cms\SourceCode\Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->contentApi()->shouldHaveType(ContentApi::class);
+        $this->extractApi()->shouldHaveType(ExtractApi::class);
+        $this->metadataApi()->shouldHaveType(MetadataApi::class);
+        $this->sourceCodeExtractApi()->shouldHaveType(SourceCodeExtractApi::class);
+        $this->validationApi()->shouldHaveType(ValidationApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/Calls/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/Calls/DiscoverySpec.php
new file mode 100644
index 00000000..10de9f2d
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/Calls/DiscoverySpec.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\Calls;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\Calls\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Calls\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Calls\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->associationsApi()->shouldHaveType(AssociationsApi::class);
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
index 390469d1..edec7d17 100644
--- a/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
@@ -9,8 +9,13 @@
 use HubSpot\Client\Crm\Objects\Api\GDPRApi;
 use HubSpot\Client\Crm\Objects\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Calls\Discovery as CallsDiscovery;
 use HubSpot\Discovery\Crm\Objects\Discovery;
+use HubSpot\Discovery\Crm\Objects\Emails\Discovery as EmailsDiscovery;
 use HubSpot\Discovery\Crm\Objects\FeedbackSubmissions\Discovery as FeedbackSubmissionsDiscovery;
+use HubSpot\Discovery\Crm\Objects\Meetings\Discovery as MeetingsDiscovery;
+use HubSpot\Discovery\Crm\Objects\Notes\Discovery as NotesDiscovery;
+use HubSpot\Discovery\Crm\Objects\Tasks\Discovery as TasksDiscovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -30,8 +35,13 @@ public function it_creates_clients()
         $this->associationsApi()->shouldHaveType(AssociationsApi::class);
         $this->basicApi()->shouldHaveType(BasicApi::class);
         $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->calls()->shouldHaveType(CallsDiscovery::class);
         $this->gdprApi()->shouldHaveType(GDPRApi::class);
+        $this->emails()->shouldHaveType(EmailsDiscovery::class);
         $this->feedbackSubmissions()->shouldHaveType(FeedbackSubmissionsDiscovery::class);
+        $this->meetings()->shouldHaveType(MeetingsDiscovery::class);
+        $this->notes()->shouldHaveType(NotesDiscovery::class);
         $this->searchApi()->shouldHaveType(SearchApi::class);
+        $this->tasks()->shouldHaveType(TasksDiscovery::class);
     }
 }
diff --git a/tests/spec/Discovery/Crm/Objects/Emails/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/Emails/DiscoverySpec.php
new file mode 100644
index 00000000..685dd56a
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/Emails/DiscoverySpec.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\Emails;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\Emails\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Emails\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Emails\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->associationsApi()->shouldHaveType(AssociationsApi::class);
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/Meetings/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/Meetings/DiscoverySpec.php
new file mode 100644
index 00000000..36d3370b
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/Meetings/DiscoverySpec.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\Meetings;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\Meetings\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Meetings\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Meetings\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->associationsApi()->shouldHaveType(AssociationsApi::class);
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/Notes/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/Notes/DiscoverySpec.php
new file mode 100644
index 00000000..b583e0de
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/Notes/DiscoverySpec.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\Notes;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\Notes\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Notes\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Notes\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->associationsApi()->shouldHaveType(AssociationsApi::class);
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/Tasks/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/Tasks/DiscoverySpec.php
new file mode 100644
index 00000000..c1004613
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/Tasks/DiscoverySpec.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\Tasks;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\Tasks\Api\AssociationsApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\BasicApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\BatchApi;
+use HubSpot\Client\Crm\Objects\Tasks\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\Tasks\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->associationsApi()->shouldHaveType(AssociationsApi::class);
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/DiscoverySpec.php b/tests/spec/Discovery/DiscoverySpec.php
index 0429d1cf..af276d2f 100644
--- a/tests/spec/Discovery/DiscoverySpec.php
+++ b/tests/spec/Discovery/DiscoverySpec.php
@@ -29,6 +29,7 @@ public function it_creates_clients()
         $this->events()->shouldHaveType(\HubSpot\Discovery\Events\Discovery::class);
         $this->files()->shouldHaveType(\HubSpot\Discovery\Files\Discovery::class);
         $this->marketing()->shouldHaveType(\HubSpot\Discovery\Marketing\Discovery::class);
+        $this->settings()->shouldHaveType(\HubSpot\Discovery\Settings\Discovery::class);
         $this->webhooks()->shouldHaveType(\HubSpot\Discovery\Webhooks\Discovery::class);
     }
 }
diff --git a/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php b/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php
new file mode 100644
index 00000000..a0218a45
--- /dev/null
+++ b/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Marketing\Events;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Marketing\Events\Api\BasicApi;
+use HubSpot\Client\Marketing\Events\Api\BatchApi;
+use HubSpot\Client\Marketing\Events\Api\SearchApi;
+use HubSpot\Client\Marketing\Events\Api\SettingsApi;
+use HubSpot\Client\Marketing\Events\Api\SubscriberStateChangesApi;
+use HubSpot\Config;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(\HubSpot\Discovery\Marketing\Events\Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+        $this->settingsApi()->shouldHaveType(SettingsApi::class);
+        $this->subscriberStateChangesApi()->shouldHaveType(SubscriberStateChangesApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Settings/DiscoverySpec.php b/tests/spec/Discovery/Settings/DiscoverySpec.php
new file mode 100644
index 00000000..495e38c0
--- /dev/null
+++ b/tests/spec/Discovery/Settings/DiscoverySpec.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Settings;
+
+use GuzzleHttp\Client;
+use HubSpot\Config;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(\HubSpot\Discovery\Settings\Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->users()->shouldHaveType(\HubSpot\Discovery\Settings\Users\Discovery::class);
+    }
+}
diff --git a/tests/spec/Discovery/Settings/Users/DiscoverySpec.php b/tests/spec/Discovery/Settings/Users/DiscoverySpec.php
new file mode 100644
index 00000000..1a37c29a
--- /dev/null
+++ b/tests/spec/Discovery/Settings/Users/DiscoverySpec.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Settings\Users;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Settings\Users\Api\RolesApi;
+use HubSpot\Client\Settings\Users\Api\TeamsApi;
+use HubSpot\Client\Settings\Users\Api\UsersApi;
+use HubSpot\Config;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(\HubSpot\Discovery\Settings\Users\Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->rolesApi()->shouldHaveType(RolesApi::class);
+        $this->teamsApi()->shouldHaveType(TeamsApi::class);
+        $this->usersApi()->shouldHaveType(UsersApi::class);
+    }
+}