Purchases enabled defaulted to false

src/dapp/public/address.json

@@ -1 +1 @@
-{"PreICO":{"address":"0x8f353619bf309b6a1f3f8ad189f994398ec2232a"}}
+{"PreICO":{"address":"0x02dbbadcb21c86b271a39b55fa99bfc0662e9ca7"}}

src/truffle/contracts/PreICO.sol

@@ -14,24 +14,22 @@ contract PreICO is DelegateableOwnerToken {
     mapping(address => uint) public customerPrice;
 
     function PreICO(uint256 initialSupply, uint256 price) {
-        totalSupply = initialSupply * (10 ** uint256(decimals));
-
+        totalSupply = initialSupply * (10 ** uint256(decimals));      
         owner = msg.sender;
         balances[owner] = totalSupply;
         _price = price;
 
-        purchasesEnabled = true;
+        purchasesEnabled = false;
     }
 
     function() payable {
         buyTokens();
     }
 
     function claimOwnership() onlyPendingOwner public {
-        // TODO: Check ORDER!!!!
-        uint256 ownerBalance = balances[owner];
+        require(pendingOwner != owner);
+        balances[pendingOwner] = balances[owner];
         balances[owner] = 0;
-        balances[pendingOwner] = ownerBalance;
         super.claimOwnership();
     }
 

src/truffle/test/PreICO.js

@@ -1,6 +1,11 @@
 var PreICO = artifacts.require("../contracts/PreICO.sol");
 
 contract("PreICO", function(accounts) {
+    beforeEach(async function() {
+        var ico = await PreICO.deployed();
+        await ico.enablePurchases(true);
+    })
+
     it("should compile and deploy!!", function(){
         var ownerBalance = 0;
         var owner;
@@ -629,6 +634,7 @@ contract("PreICO", function(accounts) {
 
         it("should return unused eth", async function() {
             var testICO = await PreICO.new(1, toWei(1));
+            await testICO.enablePurchases(true);
             var totalSupply = await testICO.totalSupply.call();
             var price = await testICO.pricePerETH.call();
             var user = accounts[8];

src/truffle/test/PreICOPausable.js

@@ -39,15 +39,15 @@ contract("PreICO when paused", function(accounts) {
         it("should disable and enable purchaseEnabled",  async function() {
             var ico = await PreICO.deployed();
             var enabled = await ico.purchasesEnabled();
-            assert.isTrue(enabled, "purchaseEnabled should be true");
-
-            await ico.enablePurchases(false);
-            enabled = await ico.purchasesEnabled();
             assert.isFalse(enabled, "purchaseEnabled should be false");
 
             await ico.enablePurchases(true);
             enabled = await ico.purchasesEnabled();
             assert.isTrue(enabled, "purchaseEnabled should be true");
+
+            await ico.enablePurchases(false);
+            enabled = await ico.purchasesEnabled();
+            assert.isFalse(enabled, "purchaseEnabled should be false");
         });
 
         it("should stop buyTokens when purchase disabled", async function() {