diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 3b460e4da9..97d04db8c6 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -50,7 +50,7 @@ export class Web3Wrapper {
     public async doesContractExistAtAddressAsync(address: string): Promise<boolean> {
         const code = await promisify(this.web3.eth.getCode)(address);
         // Regex matches 0x0, 0x00, 0x in order to accomodate poorly implemented clients
-        const zeroHexAddressRegex = /^0x0\{0,40\}$/i;
+        const zeroHexAddressRegex = /^0x0*$/i;
         const didFindCode = _.isNull(code.match(zeroHexAddressRegex));
         return didFindCode;
     }
diff --git a/test/contract_wrapper_test.ts b/test/exchange_wrapper.ts
similarity index 100%
rename from test/contract_wrapper_test.ts
rename to test/exchange_wrapper.ts