diff --git a/test/index.html b/test/index.html
index 041b447..c2c3366 100644
--- a/test/index.html
+++ b/test/index.html
@@ -3,22 +3,22 @@
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 	<title>Test | Ext.ux.Router</title>
-	
-	<link rel="stylesheet" href="http://pivotal.github.com/jasmine/lib/jasmine.css"/>
-	
-	<script src="http://pivotal.github.com/jasmine/lib/jasmine.js"></script>
-	<script src="http://pivotal.github.com/jasmine/lib/jasmine-html.js"></script>
+
+	<link rel="stylesheet" href="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine.css"/>
+
+	<script src="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+	<script src="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 	<script src="../examples/ext/ext-all-debug.js"></script>
 	<script src="../Router.js"></script>
-	
+
 	<script type="text/javascript">
-		
+
 		var app,
 			Router = Ext.ux.Router;
-		
+
 		// Helpers
 		// -------------------
-		
+
 		Ext.define('TestApp.controller.Users', {
 			extend: 'Ext.app.Controller',
 			index: Ext.emptyFn,
@@ -33,7 +33,7 @@
 		});
 
 		function initApp(routes) {
-			
+
 			app = Ext.create('Ext.app.Application',{
 				name: 'TestApp',
 				controllers: [
@@ -44,21 +44,21 @@
 			});
 		}
 
-		
+
 		// Tests
 		// -------------------
-		
+
 		afterEach(function() {
 			app = null;
 			Ext.ux.Router.ready = false;
 			Ext.ux.Router.routes = [];
 			Ext.ux.Router.clearListeners();
 		});
-		
+
 		describe("Route Matching", function() {
-				
+
 			describe("Basic Route 'users'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users': 'users#index'
@@ -68,24 +68,24 @@
 				it("shouldn't match 'fail'", function() {
 					expect(Router.parse('fail')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/'", function() {
 					expect(Router.parse('users/')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/foo'", function() {
 					expect(Router.parse('users/foo')).toBe(false);
 				});
-				
+
 				it("should match 'users'", function() {
 					expect(Router.parse('users')).toEqual({});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Basic index route ''", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						''			: 'users#index',
@@ -96,23 +96,23 @@
 				it("should match '' with ''", function() {
 					expect(Router.parse('')).toEqual({});
 				});
-				
+
 				it("should match '' with '/'", function() {
 					expect(Router.parse('/')).toEqual({});
 				});
-				
+
 				it("should skip first route '' and match 'users/1' with users/:id", function() {
 					expect(Router.parse('users/2')).toEqual({id: '2'});
 				});
-				
+
 				it("shouldn't match 'foo'", function() {
 					expect(Router.parse('foo')).toBe(false);
 				});
 			});
-			
-			
+
+
 			describe("Special index route '/'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'/'			: 'users#index',
@@ -123,31 +123,31 @@
 				it("should match '' with '/'", function() {
 					expect(Router.parse('')).toEqual({});
 				});
-				
+
 				it("should match '/' with '/'", function() {
 					expect(Router.parse('/')).toEqual({});
 				});
-				
+
 				it("should parse arguments from route '' with '?id=1'", function() {
 					expect(Router.parse('?id=1')).toEqual({id: '1'});
 				});
-				
+
 				it("should parse arguments from route '' with '/?id=1'", function() {
 					expect(Router.parse('/?id=1')).toEqual({id: '1'});
 				});
-				
+
 				it("should skip first route '/' and match 'users/1' with users/:id", function() {
 					expect(Router.parse('users/2')).toEqual({id: '2'});
 				});
-				
+
 				it("shouldn't match 'foo'", function() {
 					expect(Router.parse('foo')).toBe(false);
 				});
 			});
-			
-			
+
+
 			describe("Regex Route /^(users?)(?:\\/(\\d+)(?:\\.\\.(\\d+))?)?/", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						"users": {
@@ -161,28 +161,28 @@
 				it("shouldn't match 'foo'", function() {
 					expect(Router.parse('foo')).toBe(false);
 				});
-				
+
 				it("should match 'user'", function() {
 					expect(Router.parse('user')).toEqual({captures: ['user', undefined, undefined]});
 				});
-				
+
 				it("should match 'users'", function() {
 					expect(Router.parse('users')).toEqual({captures: ['users', undefined, undefined]});
 				});
-				
+
 				it("should match 'user/123'", function() {
 					expect(Router.parse('user/123')).toEqual({captures: ['user', '123', undefined]});
 				});
-				
+
 				it("should match 'user/123..456'", function() {
 					expect(Router.parse('user/123..456')).toEqual({captures: ['user', '123', '456']});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with 1 variable 'users/:id'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id': 'users#show'
@@ -192,7 +192,7 @@
 				it("shouldn't match 'users'", function() {
 					expect(Router.parse('users')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123/456'", function() {
 					expect(Router.parse('users/123/456')).toBe(false);
 				});
@@ -200,16 +200,16 @@
 				it("should match 'users/'", function() {
 					expect(Router.parse('users/')).toEqual({id: ''});
 				});
-				
+
 				it("should match 'users/123'", function() {
 					expect(Router.parse('users/123')).toEqual({id: '123'});
 				});
 
 			});
-			
-			
+
+
 			describe("Route with 2 variables 'users/:id/:login'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id/:login': 'users#show'
@@ -219,7 +219,7 @@
 				it("shouldn't match 'users'", function() {
 					expect(Router.parse('users')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123'", function() {
 					expect(Router.parse('users/123')).toBe(false);
 				});
@@ -227,12 +227,12 @@
 				it("should match 'users/1/bruno'", function() {
 					expect(Router.parse('users/1/bruno')).toEqual({id: '1', login: 'bruno'});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with splat 'users/*names'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/*names': 'users#showAll'
@@ -246,20 +246,20 @@
 				it("should match 'users/'", function() {
 					expect(Router.parse('users/')).toEqual({names: ''});
 				});
-				
+
 				it("should match 'users/bruno'", function() {
 					expect(Router.parse('users/bruno')).toEqual({names: 'bruno'});
 				});
-				
+
 				it("should match 'users/bruno/juris/ryan/max'", function() {
 					expect(Router.parse('users/bruno/juris/ryan/max')).toEqual({names: 'bruno/juris/ryan/max'});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with 2 splats 'users/*ids/*names'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/*ids/*names': 'users#showAll'
@@ -269,7 +269,7 @@
 				it("shouldn't match 'users'", function() {
 					expect(Router.parse('users')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123'", function() {
 					expect(Router.parse('users/123')).toBe(false);
 				});
@@ -277,32 +277,32 @@
 				it("should match 'users/123/'", function() {
 					expect(Router.parse('users/123/')).toEqual({ids: '123', names: ''});
 				});
-				
+
 				it("should match 'users//bruno'", function() {
 					expect(Router.parse('users//bruno')).toEqual({ids: '', names: 'bruno'});
 				});
-				
+
 				it("should match 'users//'", function() {
 					expect(Router.parse('users//')).toEqual({ids: '', names: ''});
 				});
-				
+
 				it("should match 'users///bruno'", function() {
 					expect(Router.parse('users///bruno')).toEqual({ids: '/', names: 'bruno'});
 				});
-				
+
 				it("should match 'users/1/bruno'", function() {
 					expect(Router.parse('users/1/bruno')).toEqual({ids: '1', names: 'bruno'});
 				});
-				
+
 				it("should match 'users/1,2,3/bruno,max,juris'", function() {
 					expect(Router.parse('users/1,2,3/bruno,max,juris')).toEqual({ids: '1,2,3', names: 'bruno,max,juris'});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with 2 variables and 2 splats 'users/:id/*roles/:name/*groups'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id/*roles/:name/*groups': 'users#show'
@@ -317,12 +317,12 @@
 						groups: 'services,engineering'
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with 2 variables and 2 splats 'users/:id/:name/*roles/*groups'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id/:name/*roles/*groups': 'users#show'
@@ -337,12 +337,12 @@
 						groups: 'services,engineering'
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route for paging 'search/:query/p:page'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'search/:query/p:page': 'users#index'
@@ -355,12 +355,12 @@
 						page: "20"
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route complex '*first/complex-:part/*rest'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'*first/complex-:part/*rest': 'users#index'
@@ -374,12 +374,12 @@
 						rest: "four/five/six/seven"
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route with args ':entity?*args'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						':entity?*args': 'users#index'
@@ -392,32 +392,32 @@
 						args: "a=b&c=d"
 					});
 				});
-				
+
 			});
-			
+
 			describe("Route optional params", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:userID/role/*roleID': 'users#index'
 					});
 				});
-			
+
 				it("should match 'users/1/role/2'", function() {
 					expect(Router.parse('users/1/role/2')).toEqual({userID: '1', roleID: '2'});
 				});
-				
+
 				it("should match 'users/1/role/'", function() {
 					expect(Router.parse('users/1/role/')).toEqual({userID: '1', roleID: ''});
 				});
-				
+
 				it("shouldn't match 'users/1/role'", function() {
 					expect(Router.parse('users/1/role')).toBe(false);
 				});
 			});
-		
+
 			describe("Route anything '*anything'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'*anything': 'users#index'
@@ -429,12 +429,12 @@
 						anything: "any-route"
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route 'users/:id' with digit only regex validator", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id': {
@@ -452,26 +452,26 @@
 				it("shouldn't match 'users/'", function() {
 					expect(Router.parse('users/')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/abc'", function() {
 					expect(Router.parse('users/abc')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123.456'", function() {
 					expect(Router.parse('users/123.456')).toBe(false);
 				});
-				
+
 				it("should match 'users/123'", function() {
 					expect(Router.parse('users/123')).toEqual({
 						id: "123"
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route 'users/:id' with digit only function validator", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id': {
@@ -491,26 +491,26 @@
 				it("shouldn't match 'users/'", function() {
 					expect(Router.parse('users/')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/abc'", function() {
 					expect(Router.parse('users/abc')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123.456'", function() {
 					expect(Router.parse('users/123.456')).toBe(false);
 				});
-				
+
 				it("should match 'users/123'", function() {
 					expect(Router.parse('users/123')).toEqual({
 						id: "123"
 					});
 				});
-				
+
 			});
-			
+
 
 			describe("Route 'users/:id' with specific id:456 validator", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id': {
@@ -530,12 +530,12 @@
 						id: "456"
 					});
 				});
-				
+
 			});
-			
-			
+
+
 			describe("Route 'users/:id/:index' with 2 validators", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id/:index': {
@@ -548,26 +548,26 @@
 						}
 					});
 				});
-				
+
 				it("shouldn't match 'users/abc/def'", function() {
 					expect(Router.parse('users/abc/def')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/abc/123'", function() {
 					expect(Router.parse('users/abc/123')).toBe(false);
 				});
-				
+
 				it("shouldn't match 'users/123/abc'", function() {
 					expect(Router.parse('users/123/abc')).toBe(false);
 				});
-				
+
 				it("should match 'users/123/456'", function() {
 					expect(Router.parse('users/123/456')).toEqual({
 						id: "123",
 						index: "456"
 					});
 				});
-				
+
 			});
 
 			describe("Routes with namespaced controllers", function() {
@@ -590,126 +590,126 @@
 				});
 
 			});
-			
+
 		});
-		
-		
+
+
 		describe("Route Events", function() {
-			
+
 			describe("Route 'users/:id'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id': 'users#show'
 					});
 				});
-				
+
 				it("should trigger 'routemissed' with route 'users'", function() {
 					var triggered = false;
-					
+
 					Router.on('routemissed', function() {
 						triggered = true;
 					});
 					Router.parse('users');
-					
+
 					expect(triggered).toBe(true);
 				});
-				
+
 				it("shouldn't trigger 'routemissed' with route 'users/1'", function() {
 					var triggered = false;
-					
+
 					Router.on('routemissed', function() {
 						triggered = true;
 					});
 					Router.parse('users/1');
-					
+
 					expect(triggered).toBe(false);
 				});
-				
+
 				it("shouldn't trigger 'beforedispatch' with route 'users'", function() {
 					var triggered = false;
-					
+
 					Router.on('beforedispatch', function() {
 						triggered = true;
 					});
 					Router.parse('users');
-					
+
 					expect(triggered).toBe(false);
 				});
-				
+
 				it("should trigger 'beforedispatch' with route 'users/1'", function() {
 					var triggered = false;
-					
+
 					Router.on('beforedispatch', function() {
 						triggered = true;
 					});
 
 					Router.parse('users/1');
-					
+
 					expect(triggered).toBe(true);
 				});
-				
+
 				it("shouldn't trigger 'dispatch' with route 'users'", function() {
 					var triggered = false;
-					
+
 					Router.on('dispatch', function() {
 						triggered = true;
 					});
 					Router.parse('users');
-					
+
 					expect(triggered).toBe(false);
 				});
-				
+
 				it("should trigger 'dispatch' with route 'users/1'", function() {
 					var triggered = false;
-					
+
 					Router.on('dispatch', function() {
 						triggered = true;
 					});
 					Router.parse('users/1');
-					
+
 					expect(triggered).toBe(true);
 				});
-				
+
 			});
-			
+
 			describe("Routes 'users/:id' and 'users/:base'", function() {
-				
+
 				beforeEach(function() {
 					initApp({
 						'users/:id'		: 'users#index',
 						'users/:action'	: 'users#show'
 					});
 				});
-				
+
 				it("should skip to next route when 'beforedispatch' returns false", function() {
-					
+
 					Router.on('beforedispatch', function(token, route) {
 						if (route.route === 'users/:id') {
 							return false;
 						}
 					});
-					
+
 					Router.on('dispatch', function(token, route, params) {
-						
+
 						expect(route.route).toBe('users/:action');
 						expect(params.action).toBe('delete');
-						
+
 					});
-					
+
 					Router.parse('users/delete');
 				});
-				
+
 			});
 		});
 
 
 		describe("Controller Dispatch", function() {
 			var args, scope;
-			
+
 			beforeEach(function() {
 				args = [];
-					
+
 				Ext.define('TestApp.controller.Users', {
 					extend: 'Ext.app.Controller',
 					index: function() {
@@ -718,52 +718,52 @@
 					}
 				});
 			});
-			
+
 			it("should dispatch route 'users/:id' with 'users/1", function() {
 				initApp({
 					'users/:id': 'users#index'
 				});
-				
+
 				Router.parse('users/1');
-				
+
 				expect(args[0]).not.toBe(undefined);
-				
+
 				if (args[0]) {
 					expect(args[0].id).toEqual('1');
 				}
 			});
-			
+
 			it("should provide parsed params with route 'users/1?name=Bruno&company=Sencha'", function() {
 				initApp({
 					'users/:id': 'users#index'
 				});
-				
+
 				Router.parse('users/1?name=Bruno&company=Sencha');
 
 				expect(args[0]).not.toBe(undefined);
-				
+
 				if (args[0]) {
 					expect(args[0].name).toEqual('Bruno');
 					expect(args[0].company).toEqual('Sencha');
 				}
 			});
-			
+
 			it("should dispatch for the same app controller, without duplicating controller instances", function() {
 				initApp({
 					'users/:id': 'users#index'
 				});
-				
+
 				var usersController = app.getController('Users');
 				Router.parse('users/1');
 				expect(scope).toBe(usersController);
 			});
-			
+
 		});
-		
-		
+
+
 		// Jasmine
 		// -------------------
-		
+
 		(function() {
 			var jasmineEnv = jasmine.getEnv();
 			jasmineEnv.updateInterval = 250;
diff --git a/test/multi-app.html b/test/multi-app.html
index eeb6870..a403f72 100644
--- a/test/multi-app.html
+++ b/test/multi-app.html
@@ -3,56 +3,56 @@
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 	<title>Test Multi-App | Ext.ux.Router</title>
-	
-	<link rel="stylesheet" href="http://pivotal.github.com/jasmine/lib/jasmine.css"/>
-	
-	<script src="http://pivotal.github.com/jasmine/lib/jasmine.js"></script>
-	<script src="http://pivotal.github.com/jasmine/lib/jasmine-html.js"></script>
+
+	<link rel="stylesheet" href="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine.css"/>
+
+	<script src="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+	<script src="http://pivotal.github.com/jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 	<script src="../examples/ext/ext-all-debug.js"></script>
 	<script src="../Router.js"></script>
-	
+
 	<script type="text/javascript">
-		
+
 		var actionArgs,
 			Router = Ext.ux.Router;
-		
+
 		// Override EventBus to make multi app structure possible.
 		// Ext might support this on the future.
 		// -------------------
-		
+
         var eventBusInstance,
             eventBusClass = Ext.app.EventBus;
-            
+
         Ext.app.EventBus = function() {
             if (!eventBusInstance) {
                 eventBusInstance = new eventBusClass();
             }
-            
+
             return eventBusInstance;
         };
 
 
 		// Helpers
 		// -------------------
-		
+
 		function createApps(finalLaunch) {
-			
+
 			var appsLaunched = 0;
-			
+
 			function launch() {
 				appsLaunched++;
 				if (appsLaunched===3) {
 					finalLaunch();
 				}
 			}
-			
+
 			Ext.define('App1.controller.Main', {
 				extend: 'Ext.app.Controller',
 				index: function() {
 					actionArgs = Ext.Array.from(arguments);
 				}
 			});
-		
+
 			Ext.application({
 				name: 'App1',
 				controllers: ['Main'],
@@ -62,15 +62,15 @@
 					'app1'	: 'main#index'
 				}
 			});
-		
-		
+
+
 			Ext.define('App2.controller.Main', {
 				extend: 'Ext.app.Controller',
 				index: function() {
 					actionArgs = Ext.Array.from(arguments);
 				}
 			});
-		
+
 			Ext.application({
 				name: 'App2',
 				controllers: ['Main'],
@@ -79,15 +79,15 @@
 					'app2'	: 'main#index'
 				}
 			});
-		
-		
+
+
 			Ext.define('App3.controller.Main', {
 				extend: 'Ext.app.Controller',
 				index: function() {
 					actionArgs = Ext.Array.from(arguments);
 				}
 			});
-		
+
 			Ext.application({
 				name: 'App3',
 				controllers: ['Main'],
@@ -104,92 +104,92 @@
 			Ext.ux.Router.init(App2.app);
 			Ext.ux.Router.init(App3.app);
 		}
-		
-		
+
+
 		// Tests
 		// -------------------
-		
+
 		describe("Supports multiple applications", function() {
-			
+
 			beforeEach(function() {
 				actionArgs = null;
-				
+
 				Router.ready = false;
 				Router.routes = [];
 				Router.apps = [];
 				Router.clearListeners();
 			});
-			
-			
+
+
 			it("should dispatch '/' to App1.controller.Main#index", function() {
 				initApps();
 				Router.parse('/');
-				
+
 				expect(actionArgs).toBeTruthy();
-				
+
 				if (actionArgs) {
 					expect(actionArgs[2]).toBeTruthy();
-				
+
 					if (actionArgs[2]) {
 						expect(actionArgs[2].action).toBe('index');
 						expect(actionArgs[2].controller).toBe('Main');
 						expect(actionArgs[2].app).toBeTruthy();
-						
+
 						if (actionArgs[2].app) {
 							expect(actionArgs[2].app.name).toBe('App1');
 						}
 					}
 				}
 			});
-			
+
 			it("should dispatch 'app2' to App2.controller.Main#index", function() {
 				initApps();
 				Router.parse('app2');
-				
+
 				expect(actionArgs).toBeTruthy();
-				
+
 				if (actionArgs) {
 					expect(actionArgs[2]).toBeTruthy();
-				
+
 					if (actionArgs[2]) {
 						expect(actionArgs[2].action).toBe('index');
 						expect(actionArgs[2].controller).toBe('Main');
 						expect(actionArgs[2].app).toBeTruthy();
-						
+
 						if (actionArgs[2].app) {
 							expect(actionArgs[2].app.name).toBe('App2');
 						}
 					}
 				}
 			});
-			
+
 			it("should dispatch 'app3' to App3.controller.Main#index", function() {
 				initApps();
 				Router.parse('app3');
-				
+
 				expect(actionArgs).toBeTruthy();
-				
+
 				if (actionArgs) {
 					expect(actionArgs[2]).toBeTruthy();
-				
+
 					if (actionArgs[2]) {
 						expect(actionArgs[2].action).toBe('index');
 						expect(actionArgs[2].controller).toBe('Main');
 						expect(actionArgs[2].app).toBeTruthy();
-						
+
 						if (actionArgs[2].app) {
 							expect(actionArgs[2].app.name).toBe('App3');
 						}
 					}
 				}
 			});
-			
+
 		});
-		
-		
+
+
 		// Jasmine
 		// -------------------
-		
+
 		(function() {
 			var jasmineEnv = jasmine.getEnv();
 			jasmineEnv.updateInterval = 250;
@@ -206,8 +206,8 @@
 				if (currentWindowOnload) {
 					currentWindowOnload();
 				}
-				
-				
+
+
 				createApps(function() {
 					execJasmine();
 				});
@@ -222,4 +222,4 @@
 </head>
 <body>
 </body>
-</html>
\ No newline at end of file
+</html>
