diff --git a/apps/app/ui-tests-app/bindings/basics.ts b/apps/app/ui-tests-app/bindings/basics.ts
index 9ada7c2a9..2273c5a59 100644
--- a/apps/app/ui-tests-app/bindings/basics.ts
+++ b/apps/app/ui-tests-app/bindings/basics.ts
@@ -1,5 +1,5 @@
-import pageModule = require("ui/page");
-import buttonModule = require("ui/button");
+import buttonModule = require("ui/button");
+import pageModule = require("ui/page");
 import textFieldModule = require("ui/text-field");
 import stackLayoutModule = require("ui/layouts/stack-layout");
 import observableModule = require("data/observable");
@@ -20,14 +20,14 @@ export function createPage() {
     targetTwoWay.id = "textFieldTwoWay";
     buttonOneWay.id = "buttonOneWay";
     buttonTwoWay.id = "buttonTwoWay";
+    buttonSetText.id = "buttonSetText";    
 
     targetOneWay.automationText = "textFieldOneWay";
     targetTwoWay.automationText = "textFieldTwoWay";
-    buttonOneWay.automationText = "buttonOneWay";
-    buttonTwoWay.automationText = "buttonTwoWay";
-
-    buttonSetText.id = "buttonSetText";
     buttonSetText.automationText = "buttonSetText";
+    //buttonOneWay.automationText = "buttonOneWay";    
+    //buttonTwoWay.automationText = "buttonTwoWay";    
+
     buttonSetText.text = "SetText";
     buttonSetText.on(buttonModule.Button.tapEvent, function () {
         targetOneWay.text = "Test";
diff --git a/apps/app/ui-tests-app/bindings/xmlbasics.xml b/apps/app/ui-tests-app/bindings/xmlbasics.xml
index 5d2baf49d..e611c3abf 100644
--- a/apps/app/ui-tests-app/bindings/xmlbasics.xml
+++ b/apps/app/ui-tests-app/bindings/xmlbasics.xml
@@ -2,7 +2,7 @@
   <StackLayout>
     <StackLayout loaded="stack0Loaded" orientation="horizontal">
       <TextField id="tf" automationText="tf" text="{{ textSource }}" width="150" />
-      <Button id="btn" automationText="btn" width="150" />
+      <Button id="btn" width="150" />
     </StackLayout>
     <StackLayout loaded="stack1Loaded">
       <Label id="label" automationText="label" text="{{ text }}" />
diff --git a/apps/app/ui-tests-app/css/text-transform.xml b/apps/app/ui-tests-app/css/text-transform.xml
index fc6a8ccf1..35e4c7ead 100644
--- a/apps/app/ui-tests-app/css/text-transform.xml
+++ b/apps/app/ui-tests-app/css/text-transform.xml
@@ -1,11 +1,11 @@
 <Page >
   <StackLayout>
-    <Button id="ChangeText" automationText="Change text" text="Change text" tap="changeTextButonTap" />
-    <Button id="Change" automationText="Change" text="Change" tap="butonTap" />
-    <Label id="Label" automationText="Label" text="label Label" style.textTransform="none" />
-    <Button id="Button" automationText="Button" text="button Button" style.textTransform="none" />
-    <TextField id="TextField" automationText="TextField" text="textField textField" style.textTransform="none" />
-    <TextView id="TextView" automationText="TextView" text="textView textView" style.textTransform="none" />
+    <Button id="ChangeText" text="Change text" tap="changeTextButonTap" />
+    <Button id="Change" text="Change" tap="butonTap" />
+    <Label id="Label" text="label Label" style.textTransform="none" />
+    <Button id="Button" text="button Button" style.textTransform="none" />
+    <TextField id="TextField" text="textField textField" style.textTransform="none" />
+    <TextView id="TextView" text="textView textView" style.textTransform="none" />
 
     <!--
     <Label text="label label" style="text-transform:none" />
diff --git a/apps/app/ui-tests-app/dialogs/dialogs.xml b/apps/app/ui-tests-app/dialogs/dialogs.xml
index facb6aafe..061a412c0 100644
--- a/apps/app/ui-tests-app/dialogs/dialogs.xml
+++ b/apps/app/ui-tests-app/dialogs/dialogs.xml
@@ -1,6 +1,6 @@
 <Page loaded="pageLoaded">
   <StackLayout>
-    <Label text="{{ name }}" id="label" automationText="label" style="text-align:center;" />
+    <Label text="{{ name }}" id="label" style="text-align:center;" />
     <Button text="action" tap="{{ actionName }}" />
     <Button text="alert" tap="{{ alertName }}" />
     <Button text="confirm" tap="{{ confirmName }}" />
diff --git a/apps/app/ui-tests-app/nordic/nordic.xml b/apps/app/ui-tests-app/nordic/nordic.xml
index e1b95fcc1..f0406ae3b 100644
--- a/apps/app/ui-tests-app/nordic/nordic.xml
+++ b/apps/app/ui-tests-app/nordic/nordic.xml
@@ -1,6 +1,6 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded">
   <StackLayout>
-    <Label id="label" automationText="label" />
+    <Label id="label"/>
     <Button text="æøå" />
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/package.json b/apps/package.json
index 38f30df87..bacfaab41 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.apps",
     "tns-ios": {
-      "version": "2.2.1"
+      "version": "2.3.0"
     },
     "tns-android": {
-      "version": "2.2.0"
+      "version": "2.3.0"
     }
   },
   "dependencies": {