add test to controlled, use "Contract" as generic name

test/controlled.js

@@ -0,0 +1,29 @@
+
+exports.Test = (contractsConfig, afterDeploy) => {
+
+    describe("Controlled", async function() {
+        this.timeout(0);
+        var Controlled;
+        var accountsArr;
+        before(function(done) {
+            EmbarkSpec.deployAll(contractsConfig, async function(accounts) { 
+                Controlled = Contract;
+                accountsArr = accounts; 
+                await afterDeploy(accounts, Contract);
+                done()
+            });
+        });
+        
+        
+        it("should start with msg.sender as controller", async function() {
+            var controller = await Controlled.methods.controller().call();
+            assert(controller, accountsArr[0]);
+        });
+
+        it("should allow controller to set new controller", async function() {
+            await Controlled.methods.changeController(accountsArr[1]).send({from: accountsArr[0]});
+            var controller = await Controlled.methods.controller().call();
+            assert(controller, accountsArr[1]);
+        });
+    }); 
+}

test/erc20token.js

@@ -7,9 +7,9 @@ exports.Test = (contractsConfig, afterDeploy) => {
       before(function(done) {
         contractsConfig["ERC20Receiver"] = {};
         EmbarkSpec.deployAll(contractsConfig, async function(accounts) { 
-        ERC20Token = Token;
+          ERC20Token = Contract;
           accountsArr = accounts; 
-        await afterDeploy(accounts, Token);
+          await afterDeploy(accounts, Contract);
           done()
         });
       });

test/testtoken.js

@@ -29,7 +29,7 @@ describe("TestToken", async function() {
     assert.equal(result, +initialBalance+100);
   });
   var erc20tokenConfig = {
-    "Token": { "instanceOf" : "TestToken" }
+    "Contract": { "instanceOf" : "TestToken" }
   }
   ERC20Token.Test(erc20tokenConfig, async function (accounts, TestToken) {
     for(i=0;i<accounts.length;i++){