diff --git a/packages/asset-swapper/contracts/test/TestNativeOrderSampler.sol b/packages/asset-swapper/contracts/test/TestNativeOrderSampler.sol
index 35a9912d6e..39cb0b2af0 100644
--- a/packages/asset-swapper/contracts/test/TestNativeOrderSampler.sol
+++ b/packages/asset-swapper/contracts/test/TestNativeOrderSampler.sol
@@ -45,7 +45,7 @@ contract TestNativeOrderSampler is
     UtilitySampler
 {
     uint8 private constant MAX_ORDER_STATUS = uint8(IExchange.OrderStatus.CANCELLED) + 1;
-    bytes32 private constant VALID_SIGNATURE_HASH = keccak256(hex"01");
+    bytes32 private constant VALID_SIGNATURE_HASH = bytes32(hex"01");
 
     function createTokens(uint256 count)
         external
diff --git a/packages/asset-swapper/test/contracts/native_order_sampler_test.ts b/packages/asset-swapper/test/contracts/native_order_sampler_test.ts
index a2ed5ce87d..1724edd118 100644
--- a/packages/asset-swapper/test/contracts/native_order_sampler_test.ts
+++ b/packages/asset-swapper/test/contracts/native_order_sampler_test.ts
@@ -7,6 +7,7 @@ import {
     getRandomInteger,
     randomAddress,
 } from '@0x/contracts-test-utils';
+import { Web3Wrapper } from '@0x/dev-utils';
 import { SignatureType } from '@0x/protocol-utils';
 import { BigNumber, hexUtils } from '@0x/utils';
 import * as _ from 'lodash';
@@ -20,11 +21,11 @@ const { NULL_BYTES, ZERO_AMOUNT } = constants;
 
 // tslint:disable: custom-no-magic-numbers
 
-// TODO jacob
-blockchainTests.resets.skip('NativeOrderSampler contract', env => {
+blockchainTests.resets('NativeOrderSampler contract', env => {
     let testContract: TestNativeOrderSamplerContract;
     let makerToken: string;
     let takerToken: string;
+    let makerAddress: string;
     const VALID_SIGNATURE = { v: 1, r: '0x01', s: '0x01', signatureType: SignatureType.EthSign };
 
     before(async () => {
@@ -36,6 +37,7 @@ blockchainTests.resets.skip('NativeOrderSampler contract', env => {
         );
         const NUM_TOKENS = new BigNumber(3);
         [makerToken, takerToken] = await testContract.createTokens(NUM_TOKENS).callAsync();
+        [makerAddress] = await new Web3Wrapper(env.provider).getAvailableAddressesAsync();
         await testContract.createTokens(NUM_TOKENS).awaitTransactionSuccessAsync();
     });
 
@@ -79,8 +81,8 @@ blockchainTests.resets.skip('NativeOrderSampler contract', env => {
         return {
             chainId: 1337,
             verifyingContract: randomAddress(),
-            maker: randomAddress(),
-            taker: randomAddress(),
+            maker: makerAddress,
+            taker: NULL_ADDRESS,
             pool: NULL_BYTES,
             sender: NULL_ADDRESS,
             feeRecipient: randomAddress(),
@@ -147,8 +149,8 @@ blockchainTests.resets.skip('NativeOrderSampler contract', env => {
     describe('getLimitOrderFillableTakerAmount()', () => {
         it('returns the full amount for a fully funded order', async () => {
             const order = createOrder();
-            const expected = getLimitOrderFillableTakerAmount(order);
             await fundMakerAsync(order);
+            const expected = getLimitOrderFillableTakerAmount(order);
             const actual = await testContract
                 .getLimitOrderFillableTakerAmount(order, VALID_SIGNATURE, testContract.address)
                 .callAsync();
diff --git a/packages/asset-swapper/test/dex_sampler_test.ts b/packages/asset-swapper/test/dex_sampler_test.ts
index 892387cbff..e09912b1e6 100644
--- a/packages/asset-swapper/test/dex_sampler_test.ts
+++ b/packages/asset-swapper/test/dex_sampler_test.ts
@@ -8,7 +8,7 @@ import {
     toBaseUnitAmount,
 } from '@0x/contracts-test-utils';
 import { FillQuoteTransformerOrderType, LimitOrderFields, SignatureType } from '@0x/protocol-utils';
-import { BigNumber, hexUtils, NULL_ADDRESS, NULL_BYTES } from '@0x/utils';
+import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 import { Pool } from '@balancer-labs/sor/dist/types';
 import * as _ from 'lodash';
 
@@ -21,13 +21,13 @@ import { MockSamplerContract } from './utils/mock_sampler_contract';
 import { generatePseudoRandomSalt } from './utils/utils';
 
 const CHAIN_ID = 1;
+const EMPTY_BYTES32 = '0x0000000000000000000000000000000000000000000000000000000000000000';
 // tslint:disable: custom-no-magic-numbers
 describe('DexSampler tests', () => {
     const MAKER_TOKEN = randomAddress();
     const TAKER_TOKEN = randomAddress();
 
     const wethAddress = getContractAddressesForChainOrThrow(CHAIN_ID).etherToken;
-    const exchangeAddress = getContractAddressesForChainOrThrow(CHAIN_ID).exchange;
     const exchangeProxyAddress = getContractAddressesForChainOrThrow(CHAIN_ID).exchangeProxy;
 
     const tokenAdjacencyGraph: TokenAdjacencyGraph = { default: [wethAddress] };
@@ -78,7 +78,7 @@ describe('DexSampler tests', () => {
                 takerAmount: getRandomInteger(1, 1e18),
                 takerTokenFeeAmount: constants.ZERO_AMOUNT,
                 chainId: CHAIN_ID,
-                pool: NULL_BYTES,
+                pool: EMPTY_BYTES32,
                 feeRecipient: NULL_ADDRESS,
                 sender: NULL_ADDRESS,
                 maker: NULL_ADDRESS,
@@ -92,11 +92,10 @@ describe('DexSampler tests', () => {
         return o;
     }
     const ORDERS = _.times(4, () => createOrder());
-    const SIMPLE_ORDERS = ORDERS.map(o => _.omit(o, ['signature', 'chainId']));
+    const SIMPLE_ORDERS = ORDERS.map(o => _.omit(o.order, ['chainId', 'verifyingContract']));
 
     describe('operations', () => {
-        // TODO jacob
-        it.skip('getLimitOrderFillableMakerAssetAmounts()', async () => {
+        it('getLimitOrderFillableMakerAssetAmounts()', async () => {
             const expectedFillableAmounts = ORDERS.map(() => getRandomInteger(0, 100e18));
             const sampler = new MockSamplerContract({
                 getLimitOrderFillableMakerAssetAmounts: (orders, signatures) => {
@@ -115,13 +114,12 @@ describe('DexSampler tests', () => {
                 async () => undefined,
             );
             const [fillableAmounts] = await dexOrderSampler.executeAsync(
-                dexOrderSampler.getLimitOrderFillableMakerAmounts(ORDERS, exchangeAddress),
+                dexOrderSampler.getLimitOrderFillableMakerAmounts(ORDERS, exchangeProxyAddress),
             );
             expect(fillableAmounts).to.deep.eq(expectedFillableAmounts);
         });
 
-        // TODO jacob
-        it.skip('getLimitOrderFillableTakerAssetAmounts()', async () => {
+        it('getLimitOrderFillableTakerAssetAmounts()', async () => {
             const expectedFillableAmounts = ORDERS.map(() => getRandomInteger(0, 100e18));
             const sampler = new MockSamplerContract({
                 getLimitOrderFillableTakerAssetAmounts: (orders, signatures) => {
@@ -140,7 +138,7 @@ describe('DexSampler tests', () => {
                 async () => undefined,
             );
             const [fillableAmounts] = await dexOrderSampler.executeAsync(
-                dexOrderSampler.getLimitOrderFillableTakerAmounts(ORDERS, exchangeAddress),
+                dexOrderSampler.getLimitOrderFillableTakerAmounts(ORDERS, exchangeProxyAddress),
             );
             expect(fillableAmounts).to.deep.eq(expectedFillableAmounts);
         });
@@ -631,7 +629,7 @@ describe('DexSampler tests', () => {
     });
 
     describe('batched operations', () => {
-        it.skip('getLimitOrderFillableMakerAssetAmounts(), getLimitOrderFillableTakerAssetAmounts()', async () => {
+        it('getLimitOrderFillableMakerAssetAmounts(), getLimitOrderFillableTakerAssetAmounts()', async () => {
             const expectedFillableTakerAmounts = ORDERS.map(() => getRandomInteger(0, 100e18));
             const expectedFillableMakerAmounts = ORDERS.map(() => getRandomInteger(0, 100e18));
             const sampler = new MockSamplerContract({
@@ -656,8 +654,8 @@ describe('DexSampler tests', () => {
                 async () => undefined,
             );
             const [fillableMakerAmounts, fillableTakerAmounts] = await dexOrderSampler.executeAsync(
-                dexOrderSampler.getLimitOrderFillableMakerAmounts(ORDERS, exchangeAddress),
-                dexOrderSampler.getLimitOrderFillableTakerAmounts(ORDERS, exchangeAddress),
+                dexOrderSampler.getLimitOrderFillableMakerAmounts(ORDERS, exchangeProxyAddress),
+                dexOrderSampler.getLimitOrderFillableTakerAmounts(ORDERS, exchangeProxyAddress),
             );
             expect(fillableMakerAmounts).to.deep.eq(expectedFillableMakerAmounts);
             expect(fillableTakerAmounts).to.deep.eq(expectedFillableTakerAmounts);