diff --git a/contracts/metatx/Forwarder.sol b/contracts/metatx/Forwarder.sol
index 6800a5da75b..0d6a1649840 100644
--- a/contracts/metatx/Forwarder.sol
+++ b/contracts/metatx/Forwarder.sol
@@ -16,8 +16,8 @@ contract Forwarder is IForwarder {
     bytes32 private constant _EIP721DOMAIN_TYPEHASH = keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
 
     mapping(address => Counters.Counter) private _nonces;
-    mapping(bytes32 => bool) public _typeHashes;
-    mapping(bytes32 => bool) public _domains;
+    mapping(bytes32 => bool) private _typeHashes;
+    mapping(bytes32 => bool) private _domains;
 
     event RequestTypeRegistered(bytes32 indexed typeHash, string typeStr);
     event DomainRegistered(bytes32 indexed domainSeparator, bytes domainValue);
diff --git a/test/metatx/Forwarder.test.js b/test/metatx/Forwarder.test.js
index 2e9018218eb..c035d83c0f3 100644
--- a/test/metatx/Forwarder.test.js
+++ b/test/metatx/Forwarder.test.js
@@ -44,16 +44,6 @@ contract('GSNRecipient', function (accounts) {
     expect(await this.recipient.isTrustedForwarder(this.forwarder.address));
   });
 
-  context('configuration', function () {
-    it('domainSeparator whitelisted', async function () {
-      expect(await this.forwarder._domains(this.domainSeparator)).to.be.equal(true);
-    });
-
-    it('typeHash whitelisted', async function () {
-      expect(await this.forwarder._typeHashes(this.requestTypeHash)).to.be.equal(true);
-    });
-  });
-
   context('when called directly', function () {
     beforeEach(async function () {
       this.context = this.recipient; // The Context behavior expects the contract in this.context