migrated xpath tests

@@ -2,33 +2,33 @@
 /*jshint strict:false*/
 /*jshint strict:false*/
 var x = require('casper').selectXPath;
 var x = require('casper').selectXPath;
 
 
-casper.test.comment('XPath');
-
-casper.start('tests/site/index.html', function() {
-    this.test.assertExists({
+casper.test.begin('XPath tests', 6, function(test) {
+    casper.start('tests/site/index.html', function() {
+        test.assertExists({
             type: 'xpath',
             type: 'xpath',
             path: '/html/body/ul/li[2]'
             path: '/html/body/ul/li[2]'
         }, 'XPath selector can find an element');
         }, 'XPath selector can find an element');
-    this.test.assertDoesntExist({
+        test.assertDoesntExist({
             type: 'xpath',
             type: 'xpath',
             path: '/html/body/ol/li[2]'
             path: '/html/body/ol/li[2]'
         }, 'XPath selector does not retrieve an unexistent element');
         }, 'XPath selector does not retrieve an unexistent element');
-    this.test.assertExists(x('/html/body/ul/li[2]'), 'selectXPath() shortcut can find an element as well');
-    this.test.assertEvalEquals(function() {
+        test.assertExists(x('/html/body/ul/li[2]'), 'selectXPath() shortcut can find an element as well');
+        test.assertEvalEquals(function() {
             return __utils__.findAll({type: 'xpath', path: '/html/body/ul/li'}).length;
             return __utils__.findAll({type: 'xpath', path: '/html/body/ul/li'}).length;
         }, 3, 'Correct number of elements are found');
         }, 3, 'Correct number of elements are found');
-});
+    });
 
 
-casper.thenClick(x('/html/body/a[2]'), function() {
-    this.test.assertTitle('CasperJS test form', 'Clicking XPath works as expected');
+    casper.thenClick(x('/html/body/a[2]'), function() {
+        test.assertTitle('CasperJS test form', 'Clicking XPath works as expected');
         this.fill(x('/html/body/form'), {
         this.fill(x('/html/body/form'), {
             email: 'chuck@norris.com'
             email: 'chuck@norris.com'
         });
         });
-    this.test.assertEvalEquals(function() {
+        test.assertEvalEquals(function() {
             return document.querySelector('input[name="email"]').value;
             return document.querySelector('input[name="email"]').value;
         }, 'chuck@norris.com', 'Casper.fill() can fill an input[type=text] form field');
         }, 'chuck@norris.com', 'Casper.fill() can fill an input[type=text] form field');
-});
+    });
 
 
-casper.run(function() {
-    this.test.done(6);
+    casper.run(function() {
+        test.done();
+    });
 });
 });