diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dcc20d4..0b70a680 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.40.0
+* Add missing criteria to credit card verification search
+* Bugfix for autoloading files with Composer
+
 ## 2.39.0
 * Add oauth functionality
 * Add 3DS info to the server side
diff --git a/lib/Braintree.php b/lib/Braintree.php
index 4fac8606..7b612452 100644
--- a/lib/Braintree.php
+++ b/lib/Braintree.php
@@ -13,58 +13,7 @@
 
 set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__)));
 
-abstract class Braintree
-{
-    /**
-     * @ignore
-     * don't permit an explicit call of the constructor!
-     * (like $t = new Braintree_Transaction())
-     */
-    protected function __construct()
-    {
-    }
-    /**
-     * @ignore
-     *  don't permit cloning the instances (like $x = clone $v)
-     */
-    protected function __clone()
-    {
-    }
-
-    /**
-     * returns private/nonexistent instance properties
-     * @ignore
-     * @access public
-     * @param string $name property name
-     * @return mixed contents of instance properties
-     */
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->_attributes)) {
-            return $this->_attributes[$name];
-        }
-        else {
-            trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
-            return null;
-        }
-    }
-
-    /**
-     * used by isset() and empty()
-     * @access public
-     * @param string $name property name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        return array_key_exists($name, $this->_attributes);
-    }
-
-    public function _set($key, $value)
-    {
-        $this->_attributes[$key] = $value;
-    }
-}
+require_once('Braintree/Base.php');
 require_once('Braintree/Modification.php');
 require_once('Braintree/Instance.php');
 
diff --git a/lib/Braintree/Address.php b/lib/Braintree/Address.php
index 9bcf9e17..c7ebd9c6 100644
--- a/lib/Braintree/Address.php
+++ b/lib/Braintree/Address.php
@@ -25,7 +25,7 @@
  * @property-read string $streetAddress
  * @property-read string $updatedAt
  */
-class Braintree_Address extends Braintree
+class Braintree_Address extends Braintree_Base
 {
     /**
      * returns false if comparing object is not a Braintree_Address,
diff --git a/lib/Braintree/ApplePayCard.php b/lib/Braintree/ApplePayCard.php
index 28f66baf..4c189662 100644
--- a/lib/Braintree/ApplePayCard.php
+++ b/lib/Braintree/ApplePayCard.php
@@ -22,7 +22,7 @@
  * @property-read string $paymentInstrumentName
  * @property-read string $updatedAt
  */
-class Braintree_ApplePayCard extends Braintree
+class Braintree_ApplePayCard extends Braintree_Base
 {
     // Card Type
     const AMEX = 'Apple Pay - American Express';
diff --git a/lib/Braintree/Base.php b/lib/Braintree/Base.php
new file mode 100644
index 00000000..f484af34
--- /dev/null
+++ b/lib/Braintree/Base.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Base functionality for library classes
+ */
+abstract class Braintree_Base
+{
+    /**
+     * Disable the default constructor
+     *
+     * Objects that inherit from Braintree_Base should be constructed with
+     * the static factory() method.
+     *
+     * @ignore
+     */
+    protected function __construct()
+    {
+    }
+
+    /**
+     * Disable cloning of objects
+     *
+     * @ignore
+     */
+    protected function __clone()
+    {
+    }
+
+    /**
+     * Accessor for instance properties stored in the private $_attributes property
+     *
+     * @ignore
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        if (array_key_exists($name, $this->_attributes)) {
+            return $this->_attributes[$name];
+        }
+        else {
+            trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
+            return null;
+        }
+    }
+
+    /**
+     * Checks for the existance of a property stored in the private $_attributes property
+     *
+     * @ignore
+     * @param string $name
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->_attributes);
+    }
+
+    /**
+     * Mutator for instance properties stored in the private $_attributes property
+     *
+     * @ignore
+     * @param string $key
+     * @param mixed $value
+     */
+    public function _set($key, $value)
+    {
+        $this->_attributes[$key] = $value;
+    }
+}
diff --git a/lib/Braintree/CoinbaseAccount.php b/lib/Braintree/CoinbaseAccount.php
index 512f7d76..7e839acc 100644
--- a/lib/Braintree/CoinbaseAccount.php
+++ b/lib/Braintree/CoinbaseAccount.php
@@ -22,7 +22,7 @@
  * @property-read string $userName
  * @property-read string $userEmail
  */
-class Braintree_CoinbaseAccount extends Braintree
+class Braintree_CoinbaseAccount extends Braintree_Base
 {
     /**
      *  factory method: returns an instance of Braintree_CoinbaseAccount
diff --git a/lib/Braintree/CreditCard.php b/lib/Braintree/CreditCard.php
index 129588c2..7763b5b1 100644
--- a/lib/Braintree/CreditCard.php
+++ b/lib/Braintree/CreditCard.php
@@ -27,7 +27,7 @@
  * @property-read string $token
  * @property-read string $updatedAt
  */
-class Braintree_CreditCard extends Braintree
+class Braintree_CreditCard extends Braintree_Base
 {
     // Card Type
     const AMEX = 'American Express';
@@ -44,7 +44,7 @@ class Braintree_CreditCard extends Braintree
     const VISA = 'Visa';
     const UNKNOWN = 'Unknown';
 
-	// Credit card origination location
+    // Credit card origination location
 	const INTERNATIONAL = "international";
 	const US            = "us";
 
@@ -289,4 +289,23 @@ public static function delete($token)
     {
         return Braintree_Configuration::gateway()->creditCard()->delete($token);
     }
+
+    public static function allCardTypes()
+    {
+        return array(
+             Braintree_CreditCard::AMEX,
+             Braintree_CreditCard::CARTE_BLANCHE,
+             Braintree_CreditCard::CHINA_UNION_PAY,
+             Braintree_CreditCard::DINERS_CLUB_INTERNATIONAL,
+             Braintree_CreditCard::DISCOVER,
+             Braintree_CreditCard::JCB,
+             Braintree_CreditCard::LASER,
+             Braintree_CreditCard::MAESTRO,
+             Braintree_CreditCard::MASTER_CARD,
+             Braintree_CreditCard::SOLO,
+             Braintree_CreditCard::SWITCH_TYPE,
+             Braintree_CreditCard::VISA,
+             Braintree_CreditCard::UNKNOWN
+        );
+    }
 }
diff --git a/lib/Braintree/CreditCardVerificationSearch.php b/lib/Braintree/CreditCardVerificationSearch.php
index e7992003..faaec71b 100644
--- a/lib/Braintree/CreditCardVerificationSearch.php
+++ b/lib/Braintree/CreditCardVerificationSearch.php
@@ -1,33 +1,53 @@
 <?php
 class Braintree_CreditCardVerificationSearch
 {
-    static function id()                               { return new Braintree_TextNode('id'); }
-    static function creditCardCardholderName()                   { return new Braintree_TextNode('credit_card_cardholder_name'); }
+    static function id() {
+	    return new Braintree_TextNode('id');
+    }
+
+    static function creditCardCardholderName() {
+	    return new Braintree_TextNode('credit_card_cardholder_name');
+    }
 
-    static function creditCardExpirationDate()         { return new Braintree_EqualityNode('credit_card_expiration_date'); }
-    static function creditCardNumber()                 { return new Braintree_PartialMatchNode('credit_card_number'); }
+    static function billingAddressDetailsPostalCode() {
+        return new Braintree_TextNode('billing_address_details_postal_code');
+    }
+
+    static function customerEmail() {
+        return new Braintree_TextNode('customer_email');
+    }
 
-    static function ids()                              { return new Braintree_MultipleValueNode('ids'); }
+    static function customerId() {
+        return new Braintree_TextNode('customer_id');
+    }
+
+    static function paymentMethodToken(){
+        return new Braintree_TextNode('payment_method_token');
+    }
+
+    static function creditCardExpirationDate() {
+	    return new Braintree_EqualityNode('credit_card_expiration_date');
+    }
+
+    static function creditCardNumber() {
+	    return new Braintree_PartialMatchNode('credit_card_number');
+    }
+
+    static function ids() {
+        return new Braintree_MultipleValueNode('ids');
+    }
+
+    static function createdAt() {
+	    return new Braintree_RangeNode("created_at");
+    }
 
     static function creditCardCardType()
     {
-        return new Braintree_MultipleValueNode("credit_card_card_type", array(
-            Braintree_CreditCard::AMEX,
-            Braintree_CreditCard::CARTE_BLANCHE,
-            Braintree_CreditCard::CHINA_UNION_PAY,
-            Braintree_CreditCard::DINERS_CLUB_INTERNATIONAL,
-            Braintree_CreditCard::DISCOVER,
-            Braintree_CreditCard::JCB,
-            Braintree_CreditCard::LASER,
-            Braintree_CreditCard::MAESTRO,
-            Braintree_CreditCard::MASTER_CARD,
-            Braintree_CreditCard::SOLO,
-            Braintree_CreditCard::SWITCH_TYPE,
-            Braintree_CreditCard::VISA,
-            Braintree_CreditCard::UNKNOWN
-        ));
-    }
-
-
-    static function createdAt()                        { return new Braintree_RangeNode("created_at"); }
+        return new Braintree_MultipleValueNode("credit_card_card_type", Braintree_CreditCard::allCardTypes());
+    }
+
+    static function status()
+    {
+        return new Braintree_MultipleValueNode("status", Braintree_Result_CreditCardVerification::allStatuses());
+    }
 }
diff --git a/lib/Braintree/Customer.php b/lib/Braintree/Customer.php
index 72ead867..05643f68 100644
--- a/lib/Braintree/Customer.php
+++ b/lib/Braintree/Customer.php
@@ -28,7 +28,7 @@
  * @property-read string $updatedAt
  * @property-read string $website
  */
-class Braintree_Customer extends Braintree
+class Braintree_Customer extends Braintree_Base
 {
     public static function all()
     {
diff --git a/lib/Braintree/Disbursement.php b/lib/Braintree/Disbursement.php
index 2772a0e5..c6748dcb 100644
--- a/lib/Braintree/Disbursement.php
+++ b/lib/Braintree/Disbursement.php
@@ -1,5 +1,5 @@
 <?php
-final class Braintree_Disbursement extends Braintree
+final class Braintree_Disbursement extends Braintree_Base
 {
     private $_merchantAccount;
 
diff --git a/lib/Braintree/Dispute.php b/lib/Braintree/Dispute.php
index bc196bbb..298dc031 100644
--- a/lib/Braintree/Dispute.php
+++ b/lib/Braintree/Dispute.php
@@ -14,7 +14,7 @@
  * @property-read string $disbursementDate
  * @property-read object $transactionDetails
  */
-final class Braintree_Dispute extends Braintree
+final class Braintree_Dispute extends Braintree_Base
 {
     protected $_attributes = array();
 
diff --git a/lib/Braintree/Merchant.php b/lib/Braintree/Merchant.php
index bfdd9095..670b61a8 100644
--- a/lib/Braintree/Merchant.php
+++ b/lib/Braintree/Merchant.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Braintree_Merchant extends Braintree
+final class Braintree_Merchant extends Braintree_Base
 {
     protected function _initialize($attribs)
     {
diff --git a/lib/Braintree/MerchantAccount.php b/lib/Braintree/MerchantAccount.php
index a3947c71..6e23baa4 100644
--- a/lib/Braintree/MerchantAccount.php
+++ b/lib/Braintree/MerchantAccount.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Braintree_MerchantAccount extends Braintree
+final class Braintree_MerchantAccount extends Braintree_Base
 {
     const STATUS_ACTIVE = 'active';
     const STATUS_PENDING = 'pending';
diff --git a/lib/Braintree/MerchantAccount/BusinessDetails.php b/lib/Braintree/MerchantAccount/BusinessDetails.php
index 906eb3aa..a25fe9f9 100644
--- a/lib/Braintree/MerchantAccount/BusinessDetails.php
+++ b/lib/Braintree/MerchantAccount/BusinessDetails.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Braintree_MerchantAccount_BusinessDetails extends Braintree
+final class Braintree_MerchantAccount_BusinessDetails extends Braintree_Base
 {
     protected function _initialize($businessAttribs)
     {
diff --git a/lib/Braintree/MerchantAccount/IndividualDetails.php b/lib/Braintree/MerchantAccount/IndividualDetails.php
index 96909cf1..2f8f4fc0 100644
--- a/lib/Braintree/MerchantAccount/IndividualDetails.php
+++ b/lib/Braintree/MerchantAccount/IndividualDetails.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Braintree_MerchantAccount_IndividualDetails extends Braintree
+final class Braintree_MerchantAccount_IndividualDetails extends Braintree_Base
 {
     protected function _initialize($individualAttribs)
     {
diff --git a/lib/Braintree/Modification.php b/lib/Braintree/Modification.php
index 7563b571..d119fcdf 100644
--- a/lib/Braintree/Modification.php
+++ b/lib/Braintree/Modification.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_Modification extends Braintree
+class Braintree_Modification extends Braintree_Base
 {
     protected function _initialize($attributes)
     {
diff --git a/lib/Braintree/OAuthCredentials.php b/lib/Braintree/OAuthCredentials.php
index 886c7c41..dc89eb28 100644
--- a/lib/Braintree/OAuthCredentials.php
+++ b/lib/Braintree/OAuthCredentials.php
@@ -7,7 +7,7 @@
  * @copyright  2014 Braintree, a division of PayPal, Inc.
  *
  */
-class Braintree_OAuthCredentials extends Braintree
+class Braintree_OAuthCredentials extends Braintree_Base
 {
     protected function _initialize($attribs)
     {
diff --git a/lib/Braintree/PartnerMerchant.php b/lib/Braintree/PartnerMerchant.php
index 84d60f1c..c5a3ba5b 100644
--- a/lib/Braintree/PartnerMerchant.php
+++ b/lib/Braintree/PartnerMerchant.php
@@ -15,7 +15,7 @@
  * @property-read string $partnerMerchantId
  * @uses Braintree_Instance inherits methods
  */
-class Braintree_PartnerMerchant extends Braintree
+class Braintree_PartnerMerchant extends Braintree_Base
 {
     protected $_attributes = array();
 
diff --git a/lib/Braintree/PayPalAccount.php b/lib/Braintree/PayPalAccount.php
index 2c07ada6..38ffedc3 100644
--- a/lib/Braintree/PayPalAccount.php
+++ b/lib/Braintree/PayPalAccount.php
@@ -21,7 +21,7 @@
  * @property-read string $token
  * @property-read string $imageUrl
  */
-class Braintree_PayPalAccount extends Braintree
+class Braintree_PayPalAccount extends Braintree_Base
 {
     /**
      *  factory method: returns an instance of Braintree_PayPalAccount
diff --git a/lib/Braintree/PaymentMethod.php b/lib/Braintree/PaymentMethod.php
index 794dce30..73aebafd 100644
--- a/lib/Braintree/PaymentMethod.php
+++ b/lib/Braintree/PaymentMethod.php
@@ -18,7 +18,7 @@
  * @copyright  2014 Braintree, a division of PayPal, Inc.
  *
  */
-class Braintree_PaymentMethod extends Braintree
+class Braintree_PaymentMethod extends Braintree_Base
 {
     // static methods redirecting to gateway
 
diff --git a/lib/Braintree/PaymentMethodNonce.php b/lib/Braintree/PaymentMethodNonce.php
index 94d030e5..f5f62a08 100644
--- a/lib/Braintree/PaymentMethodNonce.php
+++ b/lib/Braintree/PaymentMethodNonce.php
@@ -18,7 +18,7 @@
  * @copyright  2014 Braintree, a division of PayPal, Inc.
  *
  */
-class Braintree_PaymentMethodNonce extends Braintree
+class Braintree_PaymentMethodNonce extends Braintree_Base
 {
     // static methods redirecting to gateway
 
diff --git a/lib/Braintree/Plan.php b/lib/Braintree/Plan.php
index b016c53f..8b602866 100644
--- a/lib/Braintree/Plan.php
+++ b/lib/Braintree/Plan.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_Plan extends Braintree
+class Braintree_Plan extends Braintree_Base
 {
     public static function factory($attributes)
     {
diff --git a/lib/Braintree/Result/CreditCardVerification.php b/lib/Braintree/Result/CreditCardVerification.php
index 6dab30f6..ab155b20 100644
--- a/lib/Braintree/Result/CreditCardVerification.php
+++ b/lib/Braintree/Result/CreditCardVerification.php
@@ -81,4 +81,14 @@ public function  __toString()
         return __CLASS__ . '[' .
                 Braintree_Util::attributesToString($this->_attributes) .']';
     }
+
+    public static function allStatuses()
+    {
+        return array(
+            Braintree_Result_creditCardVerification::FAILED,
+            Braintree_Result_creditCardVerification::GATEWAY_REJECTED,
+            Braintree_Result_creditCardVerification::PROCESSOR_DECLINED,
+            Braintree_Result_creditCardVerification::VERIFIED,
+        );
+    }
 }
diff --git a/lib/Braintree/Result/Error.php b/lib/Braintree/Result/Error.php
index f7ad32ec..92b53865 100644
--- a/lib/Braintree/Result/Error.php
+++ b/lib/Braintree/Result/Error.php
@@ -25,7 +25,7 @@
  * @property-read object $errors Braintree_Error_ErrorCollection
  * @property-read object $creditCardVerification credit card verification data
  */
-class Braintree_Result_Error extends Braintree
+class Braintree_Result_Error extends Braintree_Base
 {
    /**
     *
diff --git a/lib/Braintree/RiskData.php b/lib/Braintree/RiskData.php
index 2be02f6c..b6ad7d5f 100644
--- a/lib/Braintree/RiskData.php
+++ b/lib/Braintree/RiskData.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_RiskData extends Braintree
+class Braintree_RiskData extends Braintree_Base
 {
     public static function factory($attributes)
     {
diff --git a/lib/Braintree/SettlementBatchSummary.php b/lib/Braintree/SettlementBatchSummary.php
index 591da15d..1fa8f484 100644
--- a/lib/Braintree/SettlementBatchSummary.php
+++ b/lib/Braintree/SettlementBatchSummary.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_SettlementBatchSummary extends Braintree
+class Braintree_SettlementBatchSummary extends Braintree_Base
 {
     public static function factory($attributes)
     {
diff --git a/lib/Braintree/Subscription.php b/lib/Braintree/Subscription.php
index 5fb92832..c5e9b5db 100644
--- a/lib/Braintree/Subscription.php
+++ b/lib/Braintree/Subscription.php
@@ -11,7 +11,7 @@
  * @package   Braintree
  * @copyright 2014 Braintree, a division of PayPal, Inc.
  */
-class Braintree_Subscription extends Braintree
+class Braintree_Subscription extends Braintree_Base
 {
     const ACTIVE = 'Active';
     const CANCELED = 'Canceled';
diff --git a/lib/Braintree/ThreeDSecureInfo.php b/lib/Braintree/ThreeDSecureInfo.php
index 5565ee88..608d70db 100644
--- a/lib/Braintree/ThreeDSecureInfo.php
+++ b/lib/Braintree/ThreeDSecureInfo.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_ThreeDSecureInfo extends Braintree
+class Braintree_ThreeDSecureInfo extends Braintree_Base
 {
     public static function factory($attributes)
     {
diff --git a/lib/Braintree/Transaction.php b/lib/Braintree/Transaction.php
index 6cba9fe0..8c7bdc1f 100644
--- a/lib/Braintree/Transaction.php
+++ b/lib/Braintree/Transaction.php
@@ -166,7 +166,7 @@
  *
  */
 
-final class Braintree_Transaction extends Braintree
+final class Braintree_Transaction extends Braintree_Base
 {
     // Transaction Status
     const AUTHORIZATION_EXPIRED    = 'authorization_expired';
diff --git a/lib/Braintree/UnknownPaymentMethod.php b/lib/Braintree/UnknownPaymentMethod.php
index c7a05d8c..bbfeef3d 100644
--- a/lib/Braintree/UnknownPaymentMethod.php
+++ b/lib/Braintree/UnknownPaymentMethod.php
@@ -20,7 +20,7 @@
  * @property-read string $token
  * @property-read string $imageUrl
  */
-class Braintree_UnknownPaymentMethod extends Braintree
+class Braintree_UnknownPaymentMethod extends Braintree_Base
 {
 
 
diff --git a/lib/Braintree/Version.php b/lib/Braintree/Version.php
index fbd019f7..93499091 100644
--- a/lib/Braintree/Version.php
+++ b/lib/Braintree/Version.php
@@ -11,7 +11,7 @@ final class Braintree_Version
      * class constants
      */
     const MAJOR = 2;
-    const MINOR = 39;
+    const MINOR = 40;
     const TINY = 0;
 
     /**
diff --git a/lib/Braintree/WebhookNotification.php b/lib/Braintree/WebhookNotification.php
index dd8b7fe4..6bdc2bd9 100644
--- a/lib/Braintree/WebhookNotification.php
+++ b/lib/Braintree/WebhookNotification.php
@@ -1,5 +1,5 @@
 <?php
-class Braintree_WebhookNotification extends Braintree
+class Braintree_WebhookNotification extends Braintree_Base
 {
     const SUBSCRIPTION_CANCELED = 'subscription_canceled';
     const SUBSCRIPTION_CHARGED_SUCCESSFULLY = 'subscription_charged_successfully';
diff --git a/tests/Braintree/fixtures/composer_implementation.php b/tests/Braintree/fixtures/composer_implementation.php
new file mode 100644
index 00000000..c92ebb52
--- /dev/null
+++ b/tests/Braintree/fixtures/composer_implementation.php
@@ -0,0 +1,5 @@
+<?php
+
+require_once __DIR__ . '/../../../vendor/autoload.php';
+
+class_exists("Braintree_Modification");
diff --git a/tests/SanityTest.php b/tests/SanityTest.php
new file mode 100644
index 00000000..0f3a28e9
--- /dev/null
+++ b/tests/SanityTest.php
@@ -0,0 +1,20 @@
+<?php
+
+class SanityTest extends PHPUnit_Framework_TestCase
+{
+    public function testLibraryWorksWithComposer()
+    {
+        if (version_compare(PHP_VERSION, "5.4.0", "<")) {
+            $this->markTestSkipped("Requires PHP >=5.4");
+        }
+
+        $returnValue = null;
+
+        $testFile = escapeshellarg(realpath(__DIR__ . '/Braintree/fixtures/composer_implementation.php'));
+        $command = sprintf('%s %s', PHP_BINARY, $testFile);
+
+        system($command, $returnValue);
+
+        $this->assertEquals(0, $returnValue);
+    }
+}
diff --git a/tests/integration/CreditCardVerificationAdvancedSearchTest.php b/tests/integration/CreditCardVerificationAdvancedSearchTest.php
index b18c950f..15053863 100644
--- a/tests/integration/CreditCardVerificationAdvancedSearchTest.php
+++ b/tests/integration/CreditCardVerificationAdvancedSearchTest.php
@@ -5,34 +5,35 @@ class Braintree_CreditCardVerificationAdvancedSearchTest extends PHPUnit_Framewo
 {
     function test_searchOnTextFields()
     {
-        $search_criteria = array(
+        $searchCriteria = array(
             'creditCardCardholderName' => 'Tim Toole',
             'creditCardExpirationDate' => '05/2010',
-            'creditCardNumber' => '4000111111111115',
+            'creditCardNumber' => Braintree_Test_CreditCardNumbers::$failsSandboxVerification['Visa'],
+            'billingAddressDetailsPostalCode' => '90210',
         );
-
         $result = Braintree_Customer::create(array(
             'creditCard' => array(
-                'cardholderName' => $search_criteria['creditCardCardholderName'],
-                'number' => $search_criteria['creditCardNumber'],
-                'expirationDate' => $search_criteria['creditCardExpirationDate'],
+                'cardholderName' => $searchCriteria['creditCardCardholderName'],
+                'number' => $searchCriteria['creditCardNumber'],
+                'expirationDate' => $searchCriteria['creditCardExpirationDate'],
+                'billingAddress' => array(
+                    'postalCode' => $searchCriteria['billingAddressDetailsPostalCode']
+                ),
                 'options' => array('verifyCard' => true),
             ),
         ));
-
         $verification = $result->creditCardVerification;
+
         $query = array(Braintree_CreditCardVerificationSearch::id()->is($verification->id));
-        foreach ($search_criteria AS $criterion => $value) {
+        foreach ($searchCriteria AS $criterion => $value) {
             $query[] = Braintree_CreditCardVerificationSearch::$criterion()->is($value);
         }
 
         $collection = Braintree_CreditCardVerification::search($query);
-
         $this->assertEquals(1, $collection->maximumCount());
-
         $this->assertEquals($result->creditCardVerification->id, $collection->firstItem()->id);
 
-        foreach ($search_criteria AS $criterion => $value) {
+        foreach ($searchCriteria AS $criterion => $value) {
             $collection = Braintree_CreditCardVerification::search(array(
                 Braintree_CreditCardVerificationSearch::$criterion()->is($value),
                 Braintree_CreditCardVerificationSearch::id()->is($result->creditCardVerification->id)
@@ -48,6 +49,47 @@ function test_searchOnTextFields()
         }
     }
 
+    function test_searchOnSuccessfulCustomerAndPaymentFields()
+    {
+        $customerId = uniqid();
+        $searchCriteria = array(
+            'customerId' => $customerId,
+            'customerEmail' => $customerId . 'sandworm@example.com',
+            'paymentMethodToken' => $customerId . 'token',
+        );
+        $result = Braintree_Customer::create(array(
+            'id' => $customerId,
+            'email' => $searchCriteria['customerEmail'],
+            'creditCard' => array(
+                'token' => $searchCriteria['paymentMethodToken'],
+                'number' => Braintree_Test_CreditCardNumbers::$visa,
+                'expirationDate' => '05/2017',
+                'options' => array('verifyCard' => true)
+            )
+        ));
+        $customer = $result->customer;
+
+        $query = array();
+        foreach ($searchCriteria AS $criterion => $value) {
+            $query[] = Braintree_CreditCardVerificationSearch::$criterion()->is($value);
+        }
+
+        $collection = Braintree_CreditCardVerification::search($query);
+        $this->assertEquals(1, $collection->maximumCount());
+
+        foreach ($searchCriteria AS $criterion => $value) {
+            $collection = Braintree_CreditCardVerification::search(array(
+                Braintree_CreditCardVerificationSearch::$criterion()->is($value),
+            ));
+            $this->assertEquals(1, $collection->maximumCount());
+
+            $collection = Braintree_CreditCardVerification::search(array(
+                Braintree_CreditCardVerificationSearch::$criterion()->is('invalid_attribute'),
+            ));
+            $this->assertEquals(0, $collection->maximumCount());
+        }
+    }
+
     function testGateway_searchEmpty()
     {
         $query = array();
@@ -68,9 +110,9 @@ function test_createdAt()
     {
         $result = Braintree_Customer::create(array(
             'creditCard' => array(
-                'cardholderName' => "Joe Smith",
-                'number' => "4000111111111115",
-                'expirationDate' => "12/2016",
+                'cardholderName' => 'Joe Smith',
+                'number' => '4000111111111115',
+                'expirationDate' => '12/2016',
                 'options' => array('verifyCard' => true),
             ),
         ));
@@ -78,9 +120,9 @@ function test_createdAt()
         $verification = $result->creditCardVerification;
 
         $past = clone $verification->createdAt;
-        $past->modify("-1 hour");
+        $past->modify('-1 hour');
         $future = clone $verification->createdAt;
-        $future->modify("+1 hour");
+        $future->modify('+1 hour');
 
         $collection = Braintree_CreditCardVerification::search(array(
             Braintree_CreditCardVerificationSearch::id()->is($verification->id),
@@ -104,13 +146,46 @@ function test_createdAt()
         $this->assertEquals($verification->id, $collection->firstItem()->id);
     }
 
+    function test_multipleValueNode_ids()
+    {
+        $result = Braintree_Customer::create(array(
+            'creditCard' => array(
+                'cardholderName' => 'Joe Smith',
+                'number' => '4000111111111115',
+                'expirationDate' => '12/2016',
+                'options' => array('verifyCard' => true),
+            ),
+        ));
+
+        $creditCardVerification = $result->creditCardVerification;
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::ids()->is($creditCardVerification->id)
+        ));
+        $this->assertEquals(1, $collection->maximumCount());
+        $this->assertEquals($creditCardVerification->id, $collection->firstItem()->id);
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::ids()->in(
+                array($creditCardVerification->id,'1234')
+            )
+        ));
+        $this->assertEquals(1, $collection->maximumCount());
+        $this->assertEquals($creditCardVerification->id, $collection->firstItem()->id);
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::ids()->is('1234')
+        ));
+        $this->assertEquals(0, $collection->maximumCount());
+    }
+
     function test_multipleValueNode_creditCardType()
     {
         $result = Braintree_Customer::create(array(
             'creditCard' => array(
-                'cardholderName' => "Joe Smith",
-                'number' => "4000111111111115",
-                'expirationDate' => "12/2016",
+                'cardholderName' => 'Joe Smith',
+                'number' => '4000111111111115',
+                'expirationDate' => '12/2016',
                 'options' => array('verifyCard' => true),
             ),
         ));
@@ -139,4 +214,40 @@ function test_multipleValueNode_creditCardType()
         ));
         $this->assertEquals(0, $collection->maximumCount());
     }
+
+    function test_multipleValueNode_status()
+    {
+        $result = Braintree_Customer::create(array(
+            'creditCard' => array(
+                'cardholderName' => 'Joe Smith',
+                'number' => '4000111111111115',
+                'expirationDate' => '12/2016',
+                'options' => array('verifyCard' => true),
+            ),
+        ));
+
+        $creditCardVerification = $result->creditCardVerification;
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::id()->is($creditCardVerification->id),
+            Braintree_CreditCardVerificationSearch::status()->is($creditCardVerification->status)
+        ));
+        $this->assertEquals(1, $collection->maximumCount());
+        $this->assertEquals($creditCardVerification->id, $collection->firstItem()->id);
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::id()->is($creditCardVerification->id),
+            Braintree_CreditCardVerificationSearch::status()->in(
+                array($creditCardVerification->status, Braintree_Result_creditCardVerification::VERIFIED)
+            )
+        ));
+        $this->assertEquals(1, $collection->maximumCount());
+        $this->assertEquals($creditCardVerification->id, $collection->firstItem()->id);
+
+        $collection = Braintree_CreditCardVerification::search(array(
+            Braintree_CreditCardVerificationSearch::id()->is($creditCardVerification->id),
+            Braintree_CreditCardVerificationSearch::status()->is(Braintree_Result_creditCardVerification::VERIFIED)
+        ));
+        $this->assertEquals(0, $collection->maximumCount());
+    }
 }
diff --git a/tests/integration/OAuthTest.php b/tests/integration/OAuthTest.php
index 6248f5b3..62b19590 100644
--- a/tests/integration/OAuthTest.php
+++ b/tests/integration/OAuthTest.php
@@ -169,20 +169,8 @@ function testBuildConnectUrl()
         $this->assertEquals(7, $query['business']['fulfillment_completed_in']);
         $this->assertEquals('USD', $query['business']['currency']);
         $this->assertEquals('http://example.com', $query['business']['website']);
-        $this->assertEquals('1559ba26eee1ace1895c7bba78ecfdb5dede82306b0c579cd2b6ab79c3f651c8', $query['signature']);
+        $this->assertEquals(64, strlen($query['signature']));
         $this->assertEquals('SHA256', $query['algorithm']);
-
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_TIMEOUT, 60);
-        curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'GET');
-        curl_setopt($curl, CURLOPT_URL, $url);
-        curl_setopt($curl, CURLOPT_ENCODING, 'gzip');
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_exec($curl);
-        $responseStatus = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-
-        $this->assertEquals(302, $responseStatus);
     }
 
     function testBuildConnectUrlWithoutOptionalParams()