diff --git a/.gitignore b/.gitignore
index 26ee0e2..1d4fdcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,6 @@ backup.json
 
 # Transpiled files
 app/ui/js/output.js
-testing/output/test_output.js
+testing/out
 **/*.css
 
diff --git a/.travis.yml b/.travis.yml
index 42fd13c..845e649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,17 @@
 language: node_js
 node_js:
     - "0.11"
+notifications:
+    email:
+        on_success: never
+        on_failure: always
+        
 before_install:
     - "npm install -g grunt-cli"
 install:
     - "npm install grunt-ts"
 script:
     - "grunt ts:build --verbose --force"
-    - "grunt ts:testing --verbose --force"
\ No newline at end of file
+    - "grunt ts:testing --verbose --force"
+    - "python testing/buildLauncher.py testing/out/output.js testing/src 0 3000 false"
+    - "node testing/out/output.js"
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 3947b25..01885dc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,36 +1,72 @@
 module.exports = function (grunt) {
+	var pkg = require('./release/src/package.json');
+	var version = pkg.version;
 
     // load the task 
-    grunt.loadNpmTasks("grunt-contrib-watch");
-    grunt.loadNpmTasks("grunt-ts");
-    grunt.loadNpmTasks("grunt-csscomb");
+    grunt.loadNpmTasks("grunt-contrib-clean");
     grunt.loadNpmTasks("grunt-contrib-copy");
-    grunt.loadNpmTasks("grunt-remove");
+    //grunt.loadNpmTasks("grunt-csscomb");
     grunt.loadNpmTasks("grunt-mkdir");
-    grunt.loadNpmTasks("grunt-zip");
     grunt.loadNpmTasks("grunt-node-webkit-builder");
+    grunt.loadNpmTasks("grunt-shell");
+    grunt.loadNpmTasks("grunt-ts");
     grunt.loadNpmTasks("grunt-contrib-uglify");
+    grunt.loadNpmTasks("grunt-contrib-watch");
+    grunt.loadNpmTasks("grunt-zip");
 
     // Configure grunt here
     grunt.initConfig({
-    	watch : {
-    		build : {
-    			files : 'app/**/*.ts',
-    			tasks : ['ts:build'],
-    			options : {
-    				interrupt : true,
-    				atBegin : true
-    			}
-    		},
-    		testing : {
-    			files : ['**/*.ts', '!testing/app_dependencies.ts'],
-    			tasks : ['copy:appDependencies', 'ts:testing'],
-    			options : {
-    				interrupt : true,
-    				atBegin : true
-    			}
-    		}
+    	clean : {
+    		build : [
+    			'tscommand-*.txt'
+    		],
+    		release : [
+    			'release/src/app',
+    			'release/releases'
+	    	]
     	},
+    	copy : {
+			release : {
+				src : 'app/ui/**/*',
+				dest : 'release/src/'
+			}
+	    },
+	    // csscomb : {
+	    // 	release : {
+	    // 		options : {
+					// config : 'csscomb-config.json'
+	    // 		},    			
+    	// 		expand : true,
+    	// 		cwd : 'app/ui/assets/',
+    	// 		src : ['**/*.scss'],
+    	// 		dest : 'app/ui/assets/'
+	    // 	}
+	    // },
+	    mkdir : {
+	    	release : {
+	    		mode : 0700,
+	    		create : ['release/src/app']
+	    	}
+	    },
+	    nodewebkit : {
+	    	options : {
+	    		build_dir : 'release',
+	    		mac : true,
+	    		win : true,
+	    		linux32 : true,
+	    		linux64 : true,
+	    		mac_icns : 'release/src/logo.icns'
+	    	},
+	    	src : ['release/src/**/*']
+	    },
+	    shell : {
+	    	testing : {
+    			command : [
+    				'cd testing',
+    				'python buildLauncher.py out/output.js src 1 5000 false'
+    			].join('&&')
+	    	}
+	    },
 	    ts: {
 	        // A specific target
 	        build: {
@@ -60,130 +96,78 @@ module.exports = function (grunt) {
 	                removeComments: true
 	            },
 	        },
-	        // Another target
 	        testing: {                               
-	            // The source TypeScript files, http://gruntjs.com/configuring-tasks#files
-	            src: ["testing/**/*.ts"],
-	            // The source html files, https://github.com/grunt-ts/grunt-ts#html-2-typescript-support   
+	            src: ["testing/src/**/*.ts"],
 	            html: false, 
-	            // If specified, generate this file that to can use for reference management
-	            reference: 'testing/test_dependencies.ts',  
-	            // If specified, generate an out.js file which is the merged js file
-	            out: 'testing/output/test_output.js',
-	            // If specified, the generate JavaScript files are placed here. Only works if out is not specified
+	            reference: 'testing/src/references.ts',  
+	            out: 'testing/out/output.js',
 	            outDir: false,
-	            // If specified, watches this directory for changes, and re-runs the current target
 	            watch: false,                     
-	            // Use to override the default options, http://gruntjs.com/configuring-tasks#options
 	            options: {     
-	                // 'es3' (default) | 'es5'
-	                target: 'es3',
-	                // 'amd' (default) | 'commonjs'    
+	                target: 'es3',   
 	                module: 'commonjs',
-	                // true (default) | false
 	                sourceMap: false,
-	                // true | false (default)
 	                declaration: false,
-	                // true (default) | false
 	                removeComments: true
 	            },
 	        }
 	    },
-	    csscomb : {
-	    	release : {
-	    		options : {
-					config : 'csscomb-config.json'
-	    		},    			
-    			expand : true,
-    			cwd : 'app/ui/assets/',
-    			src : ['**/*.scss'],
-    			dest : 'app/ui/assets/'
-	    	}
-	    },
-	    copy : {
-	    	appDependencies : {
-	    		src : 'app/dependencies.ts',
-	    		dest : 'testing/app_dependencies.ts',
-	    		options : {
-					process : function(content, srcpath) {
-						return content.replace(/\<reference path=\"(.+\.ts)\" \/\>/gi, '<reference path="../app/$1" />');
-					}
+	    uglify: {
+			release: {
+				options : {
+					compress : true,
+					mangle : false,
+					preserveComments : false
+				},
+				files: {
+					'release/src/app/ui/js/output.js' : ['release/src/app/ui/js/output.js']
 				}
-			},
-			release : {
-				src : 'app/ui/**/*',
-				dest : 'release/src/'
 			}
-	    },
-	    mkdir : {
-	    	release : {
-	    		mode : 0700,
-	    		create : ['release/src/app']
-	    	}
-	    },
-	    remove : {
-	    	options : {
-	    		trace : true
-	    	},
-	    	release : {
-	    		fileList : [
-	    			'release/releases/yimello-win.zip', 
-	    			'release/releases/yimello-mac.zip',
-	    			'release/releases/yimello-linux-32.zip',
-	    			'release/releases/yimello-linux-64.zip'
-	    		],
-	    		dirList : ['release/src/app', 'release/releases']
-	    	}
-	    },
+		},
+    	watch : {
+    		build : {
+    			files : 'app/**/*.ts',
+    			tasks : ['ts:build', 'clean:build'],
+    			options : {
+    				interrupt : true,
+    				atBegin : true
+    			}
+    		},
+    		testing : {
+    			files : ['**/*.ts'],
+    			tasks : ['ts:testing', 'shell:testing', 'clean:build'],
+    			options : {
+    				interrupt : true,
+    				atBegin : true
+    			}
+    		}
+    	},
 	    zip : {
 	    	releaseWin : {
 	    		cwd : 'release/releases/Yimello/win/',
 	    		src : ['release/releases/Yimello/win/**/*'],
-	    		dest : 'release/releases/yimello-win.zip',
+	    		dest : 'release/releases/yimello-win-' + version + '.zip',
 	    		compression : 'DEFLATE'
 	    	},
 	    	releaseMac : {
 	    		cwd : 'release/releases/Yimello/mac/',
 	    		src : ['release/releases/Yimello/mac/**/*'],
-	    		dest : 'release/releases/yimello-mac.zip',
+	    		dest : 'release/releases/yimello-mac-' + version + '.zip',
 	    		compression : 'DEFLATE'
 	    	},
 	    	releaseLinux32 : {
 	    		cwd : 'release/releases/Yimello/linux32/',
 	    		src : ['release/releases/Yimello/linux32/**/*'],
-	    		dest : 'release/releases/yimello-linux-32.zip',
+	    		dest : 'release/releases/yimello-linux-32-' + version + '.zip',
 	    		compression : 'DEFLATE'
 	    	},
 	    	releaseLinux64 : {
 	    		cwd : 'release/releases/Yimello/linux64/',
 	    		src : ['release/releases/Yimello/linux64/**/*'],
-	    		dest : 'release/releases/yimello-linux-64.zip',
+	    		dest : 'release/releases/yimello-linux-64-' + version + '.zip',
 	    		compression : 'DEFLATE'
 	    	}
-	    },
-	    nodewebkit : {
-	    	options : {
-	    		build_dir : 'release',
-	    		mac : true,
-	    		win : true,
-	    		linux32 : true,
-	    		linux64 : true,
-	    		mac_icns : 'release/src/logo.icns'
-	    	},
-	    	src : ['release/src/**/*']
-	    },
-		uglify: {
-			release: {
-				options : {
-					compress : true,
-					mangle : false,
-					preserveComments : false
-				},
-				files: {
-					'release/src/app/ui/js/output.js' : ['release/src/app/ui/js/output.js']
-				}
-			}
-		}
+	    }
 	});
 
 	grunt.registerTask('build', ['watch:build']);
@@ -191,7 +175,7 @@ module.exports = function (grunt) {
 	grunt.registerTask(
 		'release',
 		[
-			'remove:release', 
+			'clean:release', 
 			'ts:build',
 			'mkdir:release',
 			'copy:release',
diff --git a/app/helpers/VersionHelper.ts b/app/helpers/VersionHelper.ts
index db89992..f425f72 100644
--- a/app/helpers/VersionHelper.ts
+++ b/app/helpers/VersionHelper.ts
@@ -5,7 +5,7 @@ class VersionHelper {
 	//region Fields
 	
 	private static _target : string = 'http://yimello.adriencadet.com/version';
-	private static _version : string = '0.3.0';
+	private static _version : string = '0.3.1';
 
 	//endregion Fields
 	
diff --git a/package.json b/package.json
index ee0f744..c405283 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,13 @@
     "grunt-ts": "~1.9.3",
     "typescript": "~0.9.7",
     "grunt-contrib-copy": "~0.5.0",
-    "grunt-remove": "0.1.0",
     "grunt-mkdir": "~0.1.1",
     "grunt-node-webkit-builder": "~0.1.21",
     "grunt-zip": "~0.15.0",
     "grunt-contrib-uglify": "~0.5.1",
     "grunt-csscomb": "~3.0.0",
-    "grunt-contrib-watch": "~0.6.1"
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-shell": "~1.1.1"
   }
 }
diff --git a/testing/UnitTestClass.ts b/testing/UnitTestClass.ts
deleted file mode 100644
index a9dfb22..0000000
--- a/testing/UnitTestClass.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/// <reference path="test_dependencies.ts" />
-
-class UnitTestClass extends tsUnit.TestClass {
-	//region Fields
-
-	private static _classes : IList<UnitTestClass>;
-
-	private static _queue : Queue<Action0>;
-
-	//endregion Fields
-	
-	//region Constructors
-
-	//endregion Constructors
-	
-	//region Methods
-	
-	//region Private Methods
-	
-	// private static _executeQueueFunc(f : Action0) : void {
-	// 	DataAccessObject.clean((s) => f());
-	// }
-
-	//endregion Private Methods
-	
-	//region Public Methods
-
-	static handle(u : UnitTestClass) : void {
-		if (!TSObject.exists(UnitTestClass._classes)) {
-			UnitTestClass._classes = new ArrayList<UnitTestClass>();
-		}
-		UnitTestClass._classes.add(u);
-	}
-
-	static run() : void {
-		var test : tsUnit.Test = new tsUnit.Test();
-
-		if (TSObject.exists(UnitTestClass._classes)) {
-			UnitTestClass._classes.forEach((e) => {
-				test.addTestClass(e);
-			});
-		}
-		
-		test.showResults(document.getElementById('outcome'), test.run());
-		if (TSObject.exists(UnitTestClass._queue)) {
-			if (UnitTestClass._queue.getLength() > 0) {
-				Log.inform('Starting async tests. ' + UnitTestClass._queue.getLength() + ' tests to run');
-				//UnitTestClass._executeQueueFunc(UnitTestClass._queue.pop());
-				UnitTestClass._queue.pop()();
-			}
-		}
-	}
-
-	static queue(f : Action0) : void {
-		if (!TSObject.exists(UnitTestClass._queue)) {
-			UnitTestClass._queue = new Queue<Action0>();
-		}
-
-		UnitTestClass._queue.push(f);
-	}
-
-	static done() : void {
-		if (!TSObject.exists(UnitTestClass._queue)) {
-			Log.error(new Exception('Unable to call done: no functions have been queued'));
-			return;
-		}
-
-		if (UnitTestClass._queue.getLength() > 0) {
-			if (UnitTestClass._queue.getLength() % 5 === 0) {
-				Log.inform(UnitTestClass._queue.getLength() + ' async tests remaining');
-			}
-			//UnitTestClass._executeQueueFunc(UnitTestClass._queue.pop());
-			UnitTestClass._queue.pop()();
-		} else {
-			Log.inform('Last test was done');
-		}
-	}
-
-	//endregion Public Methods
-	
-	//endregion Methods
-}
diff --git a/testing/app_dependencies.ts b/testing/app_dependencies.ts
deleted file mode 100644
index 3062339..0000000
--- a/testing/app_dependencies.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Libs part
-
-/// <reference path="../app/libs/jquery.d.ts" />
-/// <reference path="../app/libs/jqueryui.d.ts" />
-
-// System part
-
-/// <reference path="../app/system/TSObject.ts" />
-/// <reference path="../app/system/NumberHelper.ts" />
-/// <reference path="../app/system/Timer.ts" />
-/// <reference path="../app/system/Action.ts" />
-/// <reference path="../app/system/Func.ts" />
-/// <reference path="../app/system/Exception.ts" />
-/// <reference path="../app/system/DOMElement.ts" />
-/// <reference path="../app/system/DOMTree.ts" />
-/// <reference path="../app/system/strings/StringBuffer.ts" />
-/// <reference path="../app/system/node-webkit/NodeWindow.ts" />
-/// <reference path="../app/system/node-webkit/Presenter.ts" />
-/// <reference path="../app/system/Regex.ts" />
-/// <reference path="../app/system/Log.ts" />
-/// <reference path="../app/system/Pair.ts" />
-/// <reference path="../app/system/Guid.ts" />
-/// <reference path="../app/system/MathHelper.ts" />
-/// <reference path="../app/system/StringHelper.ts" />
-/// <reference path="../app/helpers/FormHelper.ts" />
-/// <reference path="../app/system/Environment.ts" />
-/// <reference path="../app/system/storage/CacheAPI.ts" />
-/// <reference path="../app/system/storage/FileAPI.ts" />
-/// <reference path="../app/system/Random.ts" />
-
-// Collections parts
-
-/// <reference path="../app/system/collections/utils/CollectionException.ts" />
-/// <reference path="../app/system/collections/IList.ts" />
-/// <reference path="../app/system/collections/impl/ArrayList.ts" />
-/// <reference path="../app/system/collections/IDictionary.ts" />
-/// <reference path="../app/system/collections/impl/Dictionary.ts" />
-/// <reference path="../app/system/collections/Queue.ts" />
-
-// Storage part
-
-/// <reference path="../app/system/storage/SQLAPI.ts" />
-/// <reference path="../app/system/storage/ActiveRecord/IActiveRecordObject.ts" />
-/// <reference path="../app/system/storage/ActiveRecord/ActiveRecordConfig.ts" />
-/// <reference path="../app/system/storage/ActiveRecord/ActiveRecordException.ts" />
-/// <reference path="../app/system/storage/ActiveRecord/ActiveRecordHelper.ts" />
-/// <reference path="../app/system/storage/ActiveRecord/ActiveRecordObject.ts" />
-
-// Ajax part
-
-/// <reference path="../app/system/ajax/AjaxRequest.ts" />
-/// <reference path="../app/system/ajax/AjaxRequestDataType.ts" />
-/// <reference path="../app/system/ajax/AjaxRequestException.ts" />
-/// <reference path="../app/system/ajax/AjaxRequestType.ts" />
-/// <reference path="../app/system/ajax/GetRequest.ts" />
-
-// Helpers part
-
-/// <reference path="../app/helpers/ExceptionHandler.ts" />
-/// <reference path="../app/helpers/URLHelper.ts" />
-/// <reference path="../app/helpers/URLDetailsProvider.ts" />
-/// <reference path="../app/helpers/SecurityHelper.ts" />
-/// <reference path="../app/helpers/FaviconHelper.ts" />
-/// <reference path="../app/helpers/VersionHelper.ts" />
-
-// Beans part
-
-/// <reference path="../app/models/beans/Bookmark.ts" />
-/// <reference path="../app/models/beans/Tag.ts" />
-
-// DAO part
-
-/// <reference path="../app/models/utils/AROFactory.ts" />
-/// <reference path="../app/models/dao/utils/DAOException.ts" />
-/// <reference path="../app/models/dao/IBookmarkDAO.ts" />
-/// <reference path="../app/models/dao/ITagDAO.ts" />
-/// <reference path="../app/models/dao/ITagBookmarkDAO.ts" />
-/// <reference path="../app/models/dao/utils/DataAccessObject.ts" />
-/// <reference path="../app/models/dao/impl/BookmarkDAO.ts" />
-/// <reference path="../app/models/dao/impl/TagDAO.ts" />
-/// <reference path="../app/models/dao/impl/TagBookmarkDAO.ts" />
-/// <reference path="../app/models/dao/utils/DAOTables.ts" />
-/// <reference path="../app/models/utils/DAOFactory.ts" />
-
-// Business part
-/// <reference path="../app/models/business/utils/IInternalBookmarkBusiness.ts" />
-/// <reference path="../app/models/business/utils/IInternalTagBusiness.ts" />
-/// <reference path="../app/models/business/utils/InternalBusinessFactory.ts" />
-/// <reference path="../app/models/business/utils/TagBookmarkBusinessArgs.ts" />
-/// <reference path="../app/models/business/utils/BusinessException.ts" />
-/// <reference path="../app/models/business/IBookmarkBusiness.ts" />
-/// <reference path="../app/models/business/impl/BookmarkBusiness.ts" />
-/// <reference path="../app/models/business/ITagBusiness.ts" />
-/// <reference path="../app/models/business/impl/TagBusiness.ts" />
-/// <reference path="../app/models/business/utils/ScoredBookmark.ts" />
-/// <reference path="../app/models/business/ITagBookmarkBusiness.ts" />
-/// <reference path="../app/models/business/impl/TagBookmarkBusiness.ts" />
-/// <reference path="../app/models/utils/BusinessFactory.ts" />
-
-// Presenters part
-
-/// <reference path="../app/presenters/YimelloPresenter.ts" />
-/// <reference path="../app/presenters/IntroPresenter.ts" />
-/// <reference path="../app/presenters/TourPresenter.ts" />
-
-// Main presenter
-/// <reference path="../app/presenters/MainPresenter/context-menus/ContextMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/context-menus/BookmarkContextMenu.ts" />
-
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/OverlayMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/BookmarkFormMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/TagListMenu.ts" />
-
-//grunt-start
-/// <reference path="../app/models/business/utils/BusinessMessages.ts" />
-/// <reference path="../app/presenters/MainPresenter/BookmarkList.ts" />
-/// <reference path="../app/presenters/MainPresenter/MainPresenter.ts" />
-/// <reference path="../app/presenters/MainPresenter/SearchBar.ts" />
-/// <reference path="../app/presenters/MainPresenter/context-menus/TagContextMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/context-menus/interfaces/IBookmarkContextMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/context-menus/interfaces/ITagContextMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/interfaces/IBookmarkListListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/interfaces/ISearchBarListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/BookmarkDeletionMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/CreateBackupMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/ExportBrowserMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/ImportBackupMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/ImportBrowserMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/TagDeletionMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/TagFormMenu.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/IBookmarkDeletionMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/IBookmarkFormMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/IImportBackupMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/IImportBrowserMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/ITagDeletionMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/ITagFormMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/overlay-menus/interfaces/ITagListMenuListener.ts" />
-/// <reference path="../app/presenters/MainPresenter/templates/BookmarkTemplate.ts" />
-/// <reference path="../app/presenters/MainPresenter/templates/TagBookmarkFormTemplate.ts" />
-/// <reference path="../app/presenters/MainPresenter/templates/TagListTemplate.ts" />
-/// <reference path="../app/presenters/utils/INotifier.ts" />
-/// <reference path="../app/presenters/utils/Notifier.ts" />
-/// <reference path="../app/presenters/utils/PresenterMessages.ts" />
-//grunt-end
\ No newline at end of file
diff --git a/testing/buildLauncher.py b/testing/buildLauncher.py
new file mode 100644
index 0000000..2ba457e
--- /dev/null
+++ b/testing/buildLauncher.py
@@ -0,0 +1,102 @@
+import os
+import re
+import sys
+
+###
+ # @class BuildLauncher
+ # @brief Creates unit testing launcher including all Oscar tests
+ ###
+class BuildLauncher:
+
+	###
+	 # Collects all Oscar test classes
+	 ###
+	def __collect(self, path):
+		collected = []
+		pattern = 'class (.*) extends UnitTestClass'
+
+		for root, dirs, files in os.walk(path):
+			for fileName in files:
+				with open(os.path.join(root, fileName), 'r') as f:
+					for line in f:
+						outcome = re.findall(pattern, line)
+						for e in outcome:
+							collected.append(e)
+							
+		return collected
+
+	###
+	 # Runs engine to collect each class then appending it to output
+	 # @param output Where launcher will be appended
+	 # @param path Folder where engine can find all tests
+	 # @param testOutput Output for oscar's outcome (console|html)
+	 # @param maxRuntime Max runtime for each test
+	 # @param buildFailure If true, build will return a failure code (useful for continous integration)
+	 ###
+	def run(self, output, path, testOutput, maxRuntime, buildFailure):
+		print('\nProcessing...')
+
+		collected = self.__collect(path)
+
+		print ('Collected classes:')
+		outcome = '\nnew TestSuite()'
+		for e in collected:
+			print('\t' + e)
+			outcome += '.add(new ' + e + '())'
+
+		outcome += '.run(' + str(testOutput) + ', ' + str(maxRuntime) + ', ' + buildFailure + ');\n'
+
+
+		with open(output, 'a') as outputFile:
+			outputFile.write(outcome)
+		print('\nDone!')
+
+if __name__ == '__main__':
+	output = 'output.js'
+	path = '.'
+	testOutput = 0
+	maxRuntime = 30 * 1000
+	buildFailure = 'true'
+
+	if len(sys.argv) < 2:
+		# Wizard
+		prompt = ' > '
+		print('--- Auto test launcher wizard ---')
+
+		print('\nEnter js destination file (where I am going to append launcher):')
+		output = raw_input(prompt)
+
+		print('\nPath where I can find all your test classes: (default \'.\')')
+		data = raw_input(prompt)
+		if data != '':
+			path = data
+
+		print('\nWhich format for output? (0 = Console - default, 1 = HTML)')
+		data = raw_input(prompt)
+		if data == '0' or data == '1':
+			testOutput = data
+		
+		print('\nMaximum runtime in ms? (default 30*1000ms)')
+		data = raw_input(prompt)
+		if data.isdigit():
+			maxRuntime = data
+
+		print('\nMust Oscar exit with failure if at least one test has failed? (y - default/n)')
+		data = raw_input(prompt)
+		if data == 'y' or data == 'n':
+			if data == 'y':
+				buildFailure = 'true'
+			else:
+				buildFailure = 'false'
+	else:
+		output = sys.argv[1]
+		if len(sys.argv) >= 3:
+			path = sys.argv[2]
+			if len(sys.argv) >= 4:
+				testOutput = sys.argv[3]
+				if len(sys.argv) >= 5:
+					maxRuntime = sys.argv[4]
+					if len(sys.argv) >= 6:
+						buildFailure = sys.argv[5]
+
+	BuildLauncher().run(output, path, testOutput, maxRuntime, buildFailure)
\ No newline at end of file
diff --git a/testing/libs/tsUnit.ts b/testing/libs/tsUnit.ts
deleted file mode 100644
index 3e71330..0000000
--- a/testing/libs/tsUnit.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-/// <reference path="../test_dependencies.ts" />
-
-module tsUnit {
-    export interface ITestClass {
-
-    }
-
-    export class Test {
-        private tests: TestDefintion[] = [];
-        private testClass: TestClass = new TestClass();
-
-        addTestClass(testClass: ITestClass, name: string = 'Tests'): void {
-            this.tests.push(new TestDefintion(testClass, name));
-        }
-
-        isReservedFunctionName(functionName: string): boolean {
-            for (var prop in this.testClass) {
-                if (prop === functionName) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        run() {
-            var testContext = new TestContext();
-            var testResult = new TestResult();
-
-            for (var i = 0; i < this.tests.length; ++i) {
-                var testClass = this.tests[i].testClass;
-                var testName = this.tests[i].name;
-                for (var prop in testClass) {
-                    if (!this.isReservedFunctionName(prop)) {
-                        if (typeof testClass[prop] === 'function') {
-                            if (typeof testClass['setUp'] === 'function') {
-                                testClass['setUp']();
-                            }
-                            try {
-                                testClass[prop](testContext);
-                                testResult.passes.push(new TestDescription(testName, prop, 'OK'));
-                            } catch (err) {
-                                testResult.errors.push(new TestDescription(testName, prop, err));
-                            }
-                            if (typeof testClass['tearDown'] === 'function') {
-                                testClass['tearDown']();
-                            }
-                        }
-                    }
-                }
-            }
-
-            return testResult;
-        }
-
-        showResults(target: HTMLElement, result: TestResult) {
-            var template = '<article>' +
-                '<h1>' + this.getTestResult(result) + '</h1>' +
-                '<p>' + this.getTestSummary(result) + '</p>' +
-                '<section id="tsFail">' +
-                '<h2>Errors</h2>' +
-                '<ul class="bad">' + this.getTestResultList(result.errors) + '</ul>' +
-                '</section>' +
-                '<section id="tsOkay">' +
-                '<h2>Passing Tests</h2>' +
-                '<ul class="good">' + this.getTestResultList(result.passes) + '</ul>' +
-                '</section>' +
-                '</article>';
-
-            target.innerHTML = template;
-        }
-
-        private getTestResult(result: TestResult) {
-            return result.errors.length === 0 ? 'Test Passed' : 'Test Failed';
-        }
-
-        private getTestSummary(result: TestResult) {
-            return 'Total tests: <span id="tsUnitTotalCout">' + (result.passes.length + result.errors.length).toString() + '</span>. ' +
-                'Passed tests: <span id="tsUnitPassCount" class="good">' + result.passes.length + '</span>. ' +
-                'Failed tests: <span id="tsUnitFailCount" class="bad">' + result.errors.length + '</span>.';
-        }
-
-        private getTestResultList(testResults: TestDescription[]) {
-            var list = '';
-            var group = '';
-            var isFirst = true;
-            for (var i = 0; i < testResults.length; ++i) {
-                var result = testResults[i];
-                if (result.testName !== group) {
-                    group = result.testName;
-                    if (isFirst) {
-                        isFirst = false;
-                    } else {
-                        list += '</li></ul>';
-                    }
-                    list += '<li>' + result.testName + '<ul>';
-                }
-                list += '<li>' + result.funcName + '(): ' + this.encodeHtmlEntities(result.message) + '</li>';
-            }
-            return list + '</ul>';
-        }
-
-        private encodeHtmlEntities(input: string) {
-            var entitiesToReplace = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
-            input.replace(/[&<>]/g, function (entity) { return entitiesToReplace[entity] || entity; });
-            return input;
-        }
-    }
-
-    export class TestContext {
-        setUp() {
-        }
-
-        tearDown() {
-        }
-
-        areIdentical(a: any, b: any): void {
-            if (a !== b) {
-                throw 'areIdentical failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '" and ' +
-                    '{' + (typeof b) + '} "' + b + '"';
-            }
-        }
-
-        areNotIdentical(a: any, b: any): void {
-            if (a === b) {
-                throw 'areNotIdentical failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '" and ' +
-                    '{' + (typeof b) + '} "' + b + '"';
-            }
-        }
-
-        isTrue(a: boolean) {
-            if (!a) {
-                throw 'isTrue failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '"';
-            }
-        }
-
-        isFalse(a: boolean) {
-            if (a) {
-                throw 'isFalse failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '"';
-            }
-        }
-
-        isTruthy(a: any) {
-            if (!a) {
-                throw 'isTrue failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '"';
-            }
-        }
-
-        isFalsey(a: any) {
-            if (a) {
-                throw 'isFalse failed when passed ' +
-                    '{' + (typeof a) + '} "' + a + '"';
-            }
-        }
-
-        throws(a: { (): void; }) {
-            var isThrown = false;
-            try {
-                a();
-            } catch (ex) {
-                isThrown = true;
-            }
-            if (!isThrown) {
-                throw 'did not throw an error';
-            }
-        }
-
-        fail() {
-            throw 'fail';
-        }
-    }
-
-    export class TestClass extends TestContext {
-
-    }
-
-    export class FakeFunction {
-        constructor(public name: string, public delgate: { (...args: any[]): any; }) {
-        }
-    }
-
-    export class Fake {
-        constructor(obj: any) {
-            for (var prop in obj) {
-                if (typeof obj[prop] === 'function') {
-                    this[prop] = function () { };
-                } else {
-                    this[prop] = null;
-                }
-            }
-        }
-
-        create(): any {
-            return this;
-        }
-
-        addFunction(name: string, delegate: { (...args: any[]): any; }) {
-            this[name] = delegate;
-        }
-
-        addProperty(name: string, value: any) {
-            this[name] = value;
-        }
-    }
-
-    class TestDefintion {
-        constructor(public testClass: ITestClass, public name: string) {
-        }
-    }
-
-    class TestError implements Error {
-        constructor(public name: string, public message: string) {
-        }
-    }
-
-    export class TestDescription {
-        constructor(public testName: string, public funcName: string, public message: string) {
-        }
-    }
-
-    export class TestResult {
-        public passes: TestDescription[] = [];
-        public errors: TestDescription[] = [];
-    }
-}
\ No newline at end of file
diff --git a/testing/models/business/impl/BookmarkBusinessTest.ts b/testing/models/business/impl/BookmarkBusinessTest.ts
deleted file mode 100644
index f20d991..0000000
--- a/testing/models/business/impl/BookmarkBusinessTest.ts
+++ /dev/null
@@ -1,341 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class BookmarkBusinessTest extends UnitTestClass {
-	private _dao : Mocks.DAO.BookmarkDAO;
-	private _business : BookmarkBusiness;
-
-	private _setUp() : void {
-		this._dao = new Mocks.DAO.BookmarkDAO();
-		this._business = new BookmarkBusiness(this._dao);
-	}
-
-	private _tearDown() : void {
-		this._dao = null;
-		this._business = null;
-	}
-
-	BookmarkBusinessConstructorTest() : void {
-		// Arrange
-		var dao : IBookmarkDAO;
-		var outcome : BookmarkBusiness;
-
-		dao = new Mocks.DAO.BookmarkDAO();
-	
-		// Act
-		outcome = new BookmarkBusiness(dao);
-	
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-	}
-
-	//region EngineBookmark
-
-	BookmarkBusinessEngineBookmarkTest() : void {
-		// Arrange
-		var b : Bookmark;
-
-		this._setUp();
-	
-		b = new Bookmark();
-		b
-			.setId('  <foo ')
-			.setTitle(' >>foo  ')
-			.setURL(' http://google.fr"  ')
-			.setDescription(' <<barbar ');
-
-		// Act
-		this._business.engineBookmark(b);
-	
-		// Assert
-		this.isTrue(TSObject.exists(b));
-		this.areIdentical('&lt;foo', b.getId());
-		this.areIdentical('&gt;&gt;foo', b.getTitle());
-		this.areIdentical('http://google.fr&quot;', b.getURL());
-		this.areIdentical('&lt;&lt;barbar', b.getDescription());
-
-		this._tearDown();
-	}
-
-	BookmarkBusinessEngineBookmarkNoTitleTest() : void {
-		// Arrange
-		var b : Bookmark;
-
-		this._setUp();
-		b = new Bookmark().setURL('>>foo  ');
-	
-		// Act
-		this._business.engineBookmark(b);
-	
-		// Assert
-		this.areIdentical('&gt;&gt;foo', b.getTitle());
-
-		this._tearDown();
-	}
-
-	BookmarkBusinessEngineBookmarkEmptyTitleTest() : void {
-		// Arrange
-		var b : Bookmark;
-
-		this._setUp();
-		b = new Bookmark().setURL('>>foo  ').setTitle('');
-	
-		// Act
-		this._business.engineBookmark(b);
-	
-		// Assert
-		this.areIdentical('&gt;&gt;foo', b.getTitle());
-
-		this._tearDown();
-	}
-
-	BookmarkBusinessEngineBookmarkNoDescriptionTest() : void {
-		// Arrange
-		var b : Bookmark;
-
-		this._setUp();
-
-		b = new Bookmark();
-	
-		// Act
-		this._business.engineBookmark(b);
-	
-		// Assert
-		this.areIdentical('', b.getDescription());
-
-		this._tearDown();
-	}
-
-	//endregion EngineBookmark
-
-	BookmarkBusinessAddTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark();
-				b.setTitle('> foo ').setURL('http://google.fr');
-				this._dao.setAddOutcome(b);
-
-				// Act
-				this._business.add(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.addTimes());
-						this.areIdentical(b, this._dao.addArgs()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessAddBadURLTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark();
-				b.setTitle('> foo ').setURL('foo');
-				this._dao.setAddOutcome(b);
-
-				// Act
-				this._business.add(
-					b,
-					(outcome) => { this.fail(); },
-					(error) => {
-						this.isTrue(TSObject.exists(error));
-						this.areIdentical(0, this._dao.addTimes());
-						
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessCreateFromURLTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				this._setUp();
-
-				this._dao.setAddOutcome(new Bookmark());
-
-				// Act
-				this._business.createFromURL(
-					'http://google.fr',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.addTimes());
-						this.isTrue(TSObject.exists(this._dao.addArgs()[0]));
-						this.areIdentical('http://google.fr', this._dao.addArgs()[0].getURL());
-						this.areNotIdentical('', this._dao.addArgs()[0].getTitle());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessUpdateTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setURL('http://google.us').setTitle(' foo  ');
-
-				this._dao.setUpdateOutcome(b);
-
-				// Act
-				this._business.update(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.updateTimes());
-						this.areIdentical(b, this._dao.updateArgs()[0]);
-						this.areIdentical('http://google.us', b.getURL());
-						this.areIdentical('foo', b.getTitle());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessUpdateBadURLTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setURL('  bar  ').setTitle(' foo  ');
-
-				// Act
-				this._business.update(
-					b,
-					(outcome) => {
-						this.fail();
-					},
-					(error) => {
-						// Assert
-						this.isTrue(TSObject.exists(error));
-						this.areIdentical(0, this._dao.updateTimes());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessDeleteTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-				this._dao.setDeleteOutcome(true);
-
-				// Act
-				this._business.delete(
-					b,
-					() => {
-						// Assert
-						this.areIdentical(1, this._dao.deleteTimes());
-						this.areIdentical(b, this._dao.deleteArgs()[0]);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessFindTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-				this._dao.setFindOutcome(b);
-
-				// Act
-				this._business.find(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.findTimes());
-						this.areIdentical('foo', this._dao.findArgs()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkBusinessSortByViewsDescThenByTitleAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Bookmark>;
-
-				this._setUp();
-
-				l = new ArrayList<Bookmark>();
-				l.add(new Bookmark().setId('foo'));
-				l.add(new Bookmark().setId('bar'));
-				this._dao.setSortByViewsDescThenByTitleAscOutcome(l);
-
-				// Act
-				this._business.sortByViewsDescThenByTitleAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.sortByViewsDescThenByTitleAscTimes());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new BookmarkBusinessTest());
diff --git a/testing/models/business/impl/TagBookmarkBusinessTest.ts b/testing/models/business/impl/TagBookmarkBusinessTest.ts
deleted file mode 100644
index d9e091a..0000000
--- a/testing/models/business/impl/TagBookmarkBusinessTest.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class TagBookmarkBusinessTest extends UnitTestClass {
-	private _tagDAO : Mocks.DAO.TagDAO;
-	private _bookmarkDAO : Mocks.DAO.BookmarkDAO;
-	private _tagBookmarkDAO : Mocks.DAO.TagBookmarkDAO;
-	private _tagBusiness : Mocks.Business.TagBusiness;
-	private _bookmarkBusiness : Mocks.Business.BookmarkBusiness;
-	private _args : TagBookmarkBusinessArgs;
-	private _business : TagBookmarkBusiness;
-
-	private _setUp() : void {
-		this._tagDAO = new Mocks.DAO.TagDAO();
-		this._bookmarkDAO = new Mocks.DAO.BookmarkDAO();
-		this._tagBookmarkDAO = new Mocks.DAO.TagBookmarkDAO();
-		this._tagBusiness = new Mocks.Business.TagBusiness();
-		this._bookmarkBusiness = new Mocks.Business.BookmarkBusiness();
-
-		this._args = new TagBookmarkBusinessArgs();
-		this._args
-			.setTagDAO(this._tagDAO)
-			.setBookmarkDAO(this._bookmarkDAO)
-			.setTagBookmarkDAO(this._tagBookmarkDAO)
-			.setTagBusiness(this._tagBusiness)
-			.setBookmarkBusiness(this._bookmarkBusiness);
-
-		this._business = new TagBookmarkBusiness(this._args);
-	}
-
-	private _tearDown() : void {
-		this._tagDAO = null;
-		this._bookmarkDAO = null;
-		this._tagBookmarkDAO = null;
-		this._tagBusiness = null;
-		this._bookmarkBusiness = null;
-		this._args = null;
-		this._business = null;
-	}
-
-	TagBookmarkBusinessConstructorTest() : void {
-		// Arrange
-		var args : TagBookmarkBusinessArgs;
-		var outcome : TagBookmarkBusiness;
-
-		args = new TagBookmarkBusinessArgs();
-	
-		// Act
-		outcome = new TagBookmarkBusiness(args);
-	
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-	}
-
-	TagBookmarkBusinessSortTagsByLabelAscForBookmarkTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Tag>;
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foobar');
-				l = new ArrayList<Tag>();
-				l.add(new Tag().setId('foo'));
-				l.add(new Tag().setId('bar'));
-
-				this._tagBookmarkDAO.setSortTagsByLabelAscForBookmarkOutcome(l);
-
-				// Act
-				this._business.sortTagsByLabelAscForBookmark(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._tagBookmarkDAO.sortTagsByLabelAscForBookmarkTimes());
-						this.areIdentical(b, this._tagBookmarkDAO.sortTagsByLabelAscForBookmarkArgs()[0]);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkBusinessBindTagsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-				var tags : IList<Tag>;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-				tags = new ArrayList<Tag>();
-				tags.add(new Tag().setId('bar'));
-				tags.add(new Tag().setId('foobar'));
-
-				this._tagBookmarkDAO.setAddMultipleTagsRelationsOutcome(true);
-
-				// Act
-				this._business.bindTags(
-					b,
-					tags,
-					() => {
-						// Assert
-						this.areIdentical(1, this._tagBookmarkDAO.addMultipleTagRelationsTimes());
-						this.areIdentical(b, this._tagBookmarkDAO.addMultipleTagRelationsArgs()[0]);
-						this.areIdentical(tags, this._tagBookmarkDAO.addMultipleTagRelationsArgs()[1]);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkBusinessUpdateTagBindingTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-				var tags : IList<Tag>;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-				tags = new ArrayList<Tag>();
-				tags.add(new Tag().setId('bar'));
-				tags.add(new Tag().setId('foobar'));
-
-				this._tagBookmarkDAO.setUpdateBookmarkRelationsOutcome(true);
-
-				// Act
-				this._business.updateTagBinding(
-					b,
-					tags,
-					() => {
-						// Assert
-						this.areIdentical(1, this._tagBookmarkDAO.updateBookmarkRelationsTimes());
-						this.areIdentical(b, this._tagBookmarkDAO.updateBookmarkRelationsArgs()[0]);
-						this.areIdentical(tags, this._tagBookmarkDAO.updateBookmarkRelationsArgs()[1]);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkBusinessSortBookmarksByTitleAscForTagTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-				var l : IList<Bookmark>;
-
-				this._setUp();
-
-				t = new Tag().setId('foo');
-				l = new ArrayList<Bookmark>();
-				l.add(new Bookmark().setId('bar'));
-				l.add(new Bookmark().setId('foobar'));
-
-				this._tagBookmarkDAO.setSortBookmarksByTitleAscForTagOutcome(l);
-
-				// Act
-				this._business.sortBookmarksByTitleAscForTag(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._tagBookmarkDAO.sortBookmarksByTitleAscForTagTimes());
-						this.areIdentical(t, this._tagBookmarkDAO.sortBookmarksByTitleAscForTagArgs()[0]);
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkBusinessSearchTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var list : IList<Pair<Bookmark, IList<Tag>>>;
-				var t1 : Tag, t2 : Tag;
-				var b1 : Bookmark, b2 : Bookmark;
-				var tags1 : IList<Tag>, tags2 : IList<Tag>;
-
-				this._setUp();
-
-				b1 = new Bookmark().setTitle('foo').setDescription('foobar');
-				b2 = new Bookmark().setTitle('bar').setURL('foo');
-				t1 = new Tag().setLabel('foobarbar');
-				t2 = new Tag().setLabel('barbar');
-
-				list = new ArrayList<Pair<Bookmark, IList<Tag>>>();
-				tags1 = new ArrayList<Tag>();
-				tags1.add(t1);
-				tags2 = new ArrayList<Tag>();
-				tags2.add(t2);
-				list.add(new Pair<Bookmark, IList<Tag>>(b1, tags1));
-				list.add(new Pair<Bookmark, IList<Tag>>(b2, tags2));
-
-				this._tagBookmarkDAO.setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(list);
-
-				// Act
-				this._business.search(
-					'foo hello',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._tagBookmarkDAO.sortBookmarksByTitleAscWithBoundTagsByLabelAscTimes());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-						this.areIdentical('foo', outcome.getAt(0).getTitle());
-						this.areIdentical(1, outcome.getAt(0).getScore());
-						this.areIdentical('bar', outcome.getAt(1).getTitle());
-						this.areIdentical(2 / 7, outcome.getAt(1).getScore());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new TagBookmarkBusinessTest());
diff --git a/testing/models/business/impl/TagBusinessTest.ts b/testing/models/business/impl/TagBusinessTest.ts
deleted file mode 100644
index 1acd161..0000000
--- a/testing/models/business/impl/TagBusinessTest.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class TagBusinessTest extends UnitTestClass {
-	private _dao : Mocks.DAO.TagDAO;
-	private _business : TagBusiness;
-
-	private _setUp() : void {
-		this._dao = new Mocks.DAO.TagDAO();
-		this._business = new TagBusiness(this._dao);
-	}
-
-	private _tearDown() : void {
-		this._dao = null;
-		this._business = null;
-	}
-
-	TagBusinessConstructorTest() : void {
-		// Arrange
-		var dao : ITagDAO;
-		var outcome : TagBusiness;
-
-		dao = new Mocks.DAO.TagDAO();
-	
-		// Act
-		outcome = new TagBusiness(dao);
-	
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-	}
-
-	TagBusinessEngineTagTest() : void {
-		// Arrange
-		var t : Tag;
-
-		this._setUp();
-
-		t = new Tag().setId(' >> foo < ').setLabel('" bar   ');
-	
-		// Act
-		this._business.engineTag(t);
-	
-		// Assert
-		this.isTrue(TSObject.exists(t));
-		this.areIdentical('&gt;&gt; foo &lt;', t.getId());
-		this.areIdentical('&quot; bar', t.getLabel());
-
-		this._tearDown();
-	}
-
-	//region isValueValid
-
-	TagBusinessIsValueValidTest() : void {
-		// Arrange
-		var value : string;
-		var isValid : boolean;
-
-		this._setUp();
-
-		value = '  foo  ';
-	
-		// Act
-		isValid = this._business.isValueValid(value);
-	
-		// Assert
-		this.isTrue(isValid);
-
-		this._tearDown();
-	}
-
-	TagBusinessIsValueValidNullStringTest() : void {
-		// Arrange
-		var value : string;
-		var isValid : boolean;
-
-		this._setUp();
-
-		value = undefined;
-	
-		// Act
-		isValid = this._business.isValueValid(value);
-	
-		// Assert
-		this.isFalse(isValid);
-
-		this._tearDown();
-	}
-
-	TagBusinessIsValueValidEmptyStringTest() : void {
-		// Arrange
-		var value : string;
-		var isValid : boolean;
-
-		this._setUp();
-
-		value = '    ';
-	
-		// Act
-		isValid = this._business.isValueValid(value);
-	
-		// Assert
-		this.isFalse(isValid);
-
-		this._tearDown();
-	}
-
-	//endregion isValueValid
-
-	TagBusinessIsNotAlreadyExistingTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				this._setUp();
-				this._dao.setFindByLabelOutcome(null);
-
-				// Act
-				this._business.isNotAlreadyExisting(
-					'  foo< ',
-					(success) => {
-						// Assert
-						this.areIdentical(1, this._dao.findByLabelTimes());
-						this.areIdentical('foo&lt;', this._dao.findByLabelArgs()[0]);
-						this.isTrue(success);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessAddTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setLabel('  > foo ');
-				this._dao.setAddOutcome(t);
-
-				// Act
-				this._business.add(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.addTimes());
-						this.areIdentical(t, this._dao.addArgs()[0]);
-						this.areIdentical('&gt; foo', t.getLabel());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(t, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessAddBadLabelTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setLabel('  ');
-				this._dao.setAddOutcome(t);
-
-				// Act
-				this._business.add(
-					t,
-					(outcome) => {
-						this.fail();
-					},
-					(error) => {
-						// Assert
-						this.areIdentical(0, this._dao.addTimes());
-						this.isTrue(TSObject.exists(error));
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessAddListTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Tag>;
-
-				this._setUp();
-
-				l = new ArrayList<Tag>();
-				l.add(new Tag().setLabel(' foo'));
-				l.add(new Tag().setLabel('bar  '));
-				l.add(new Tag().setLabel('> foobar  '));
-
-				this._dao.setAddOutcome(new Tag());
-
-				// Act
-				this._business.addList(
-					l,
-					(outcome) => {
-						// Assert
-						this.areIdentical(3, this._dao.addTimes());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(3, outcome.getLength());
-						this.areIdentical('foo', l.getAt(0).getLabel());
-						this.areIdentical('bar', l.getAt(1).getLabel());
-						this.areIdentical('&gt; foobar', l.getAt(2).getLabel());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessUpdateTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag();
-				t.setId(' > foo').setLabel('  bar  ');
-				this._dao.setUpdateOutcome(t);
-
-				// Act
-				this._business.update(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.updateTimes());
-						this.areIdentical(t, this._dao.updateArgs()[0]);
-						this.areIdentical('&gt; foo', t.getId());
-						this.areIdentical('bar', t.getLabel());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(t, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessUpdateNullTagTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-
-				this._setUp();
-
-				// Act
-				this._business.update(
-					undefined,
-					(outcome) => {
-						this.fail();
-					},
-					(error) => {
-						// Assert
-						this.areIdentical(0, this._dao.updateTimes());
-						this.isTrue(TSObject.exists(error));
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessDeleteTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setId('foo');
-				this._dao.setDeleteOutcome(true);
-
-				// Act
-				this._business.delete(
-					t,
-					() => {
-						// Assert
-						this.areIdentical(1, this._dao.deleteTimes());
-						this.areIdentical(t, this._dao.deleteArgs()[0]);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessMergeTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t1 : Tag, t2 : Tag, t3 : Tag;
-				var input : IList<any>, existing : IList<any>;
-
-				this._setUp();
-
-				t1 = new Tag().setId('foo').setLabel('Al Pacino');
-				t2 = new Tag().setId('bar').setLabel('Keanu Reeves');
-				t3 = new Tag().setId('foobar').setLabel('Robert De Niro');
-
-				input = new ArrayList<Tag>();
-				input.add(t1);
-				input.add(t2);
-				input.add(t3);
-				existing = new ArrayList<Tag>();
-				existing.add(t1);
-				existing.add(t2);
-
-				this._dao.setGetOutcome(existing);
-				this._dao.setAddOutcome(t3);
-
-				// Act
-				this._business.merge(
-					input,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.getTimes());
-						this.areIdentical(1, this._dao.addTimes());
-						this.areIdentical(t3, this._dao.addArgs()[0]);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(3, outcome.getLength());
-						this.isTrue(TSObject.exists(outcome.findFirst(e => e.getId() === 'foo')));
-						this.isTrue(TSObject.exists(outcome.findFirst(e => e.getId() === 'bar')));
-						this.isTrue(TSObject.exists(outcome.findFirst(e => e.getId() === 'foobar')));
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBusinessSortByLabelAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Tag>;
-
-				this._setUp();
-
-				l = new ArrayList<Tag>();
-				l.add(new Tag().setId('foo'));
-				l.add(new Tag().setId('bar'));
-
-				this._dao.setSortByLabelAscOutcome(l);
-
-				// Act
-				this._business.sortByLabelAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._dao.sortByLabelAscTimes());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new TagBusinessTest());
diff --git a/testing/models/dao/impl/BookmarkDAOTest.ts b/testing/models/dao/impl/BookmarkDAOTest.ts
deleted file mode 100644
index 9554513..0000000
--- a/testing/models/dao/impl/BookmarkDAOTest.ts
+++ /dev/null
@@ -1,384 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class BookmarkDAOTest extends UnitTestClass {
-	private _tagBkDAO : Mocks.DAO.TagBookmarkDAO;
-	private _aro : Mocks.DAO.ActiveRecordObject;
-	private _dao : BookmarkDAO;
-
-	private _setUp() : void {
-		this._aro = new Mocks.DAO.ActiveRecordObject();
-		this._tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
-		this._dao = new BookmarkDAO(this._aro, this._tagBkDAO);
-	}
-
-	private _tearDown() : void {
-		this._aro = null;
-		this._tagBkDAO = null;
-		this._dao = null;
-	}
-
-	BookmarkDAOConstructorTest() : void {
-		// Arrange
-		var tagBKDAO : ITagBookmarkDAO;
-		var aro : IActiveRecordObject;
-		var outcome : BookmarkDAO;
-
-		tagBKDAO = new Mocks.DAO.TagBookmarkDAO();
-		aro = new Mocks.DAO.ActiveRecordObject();
-	
-		// Act
-		outcome = new BookmarkDAO(aro, tagBKDAO);
-	
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical(aro, outcome.getARO());
-	}
-
-	BookmarkDAOAddTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b =
-					new Bookmark()
-					.setId('useless')
-					.setTitle('foo')
-					.setURL('google.fr')
-					.setDescription('Amazing')
-					.setViews(60000);
-
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.add(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.insertTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.insertArgs()[0]);
-
-						this.areIdentical(5, this._aro.insertArgs()[1].getLength());
-						this.areNotIdentical('useless', this._aro.insertArgs()[1].getAt(0));
-						this.areIdentical('google.fr', this._aro.insertArgs()[1].getAt(1));
-						this.areIdentical('foo', this._aro.insertArgs()[1].getAt(2));
-						this.areIdentical('Amazing', this._aro.insertArgs()[1].getAt(3));
-						this.areIdentical(0, this._aro.insertArgs()[1].getAt(4));
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areNotIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOAddRawTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b =
-					new Bookmark()
-					.setId('10')
-					.setTitle('foo')
-					.setURL('google.fr')
-					.setDescription('Amazing')
-					.setViews(60000);
-
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.addRaw(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.insertTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.insertArgs()[0]);
-
-						this.areIdentical(5, this._aro.insertArgs()[1].getLength());
-						this.areIdentical('10', this._aro.insertArgs()[1].getAt(0));
-						this.areIdentical('google.fr', this._aro.insertArgs()[1].getAt(1));
-						this.areIdentical('foo', this._aro.insertArgs()[1].getAt(2));
-						this.areIdentical('Amazing', this._aro.insertArgs()[1].getAt(3));
-						this.areIdentical(60000, this._aro.insertArgs()[1].getAt(4));
-
-						this.isTrue(outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOUpdateTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b =
-					new Bookmark()
-					.setId('bar')
-					.setTitle('foo')
-					.setURL('google.fr')
-					.setDescription('Amazing')
-					.setViews(500);
-
-				this._aro.setUpdateOutcome(true);
-
-				// Act
-				this._dao.update(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.updateTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.updateArgs()[0]);
-
-						this.areIdentical('id', this._aro.updateArgs()[1].getFirst());
-						this.areIdentical('bar', this._aro.updateArgs()[1].getSecond());
-
-						this.areIdentical(4, this._aro.updateArgs()[2].getLength());
-						this.areIdentical('google.fr', this._aro.updateArgs()[2].get('url'));
-						this.areIdentical('foo', this._aro.updateArgs()[2].get('title'));
-						this.areIdentical('Amazing', this._aro.updateArgs()[2].get('description'));
-						this.areIdentical(500, this._aro.updateArgs()[2].get('views'));
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAODeleteTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-
-				this._tagBkDAO.setRemoveBookmarkRelationsOutcome(true);
-				this._aro.setDeleteOutcome(true);
-
-				// Act
-				this._dao.delete(
-					b,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._tagBkDAO.removeBookmarkRelationsTimes());
-						this.areIdentical(b, this._tagBkDAO.removeBookmarkRelationsArgs()[0]);
-
-						this.areIdentical(1, this._aro.deleteTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.deleteArgs()[0]);
-						this.areIdentical('id', this._aro.deleteArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.deleteArgs()[1].getSecond());
-
-						this.isTrue(outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOGetTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Bookmark>;
-
-				this._setUp();
-
-				l = new ArrayList<Bookmark>();
-				l.add(new Bookmark().setId('foo'));
-				l.add(new Bookmark().setId('bar'));
-				this._aro.setGetOutcome(l);
-
-				// Act
-				this._dao.get(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.getTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.getArgs()[0]);
-						this.areIdentical(Bookmark.fromObject, this._aro.getArgs()[2]);
-
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOFindTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b : Bookmark;
-
-				this._setUp();
-
-				b = new Bookmark().setId('foo');
-				this._aro.setFindOutcome(b);
-
-				// Act
-				this._dao.find(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.findTimes());
-						this.areIdentical(DAOTables.Bookmarks, this._aro.findArgs()[0]);
-						this.areIdentical('id', this._aro.findArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.findArgs()[1].getSecond());
-						this.areIdentical(Bookmark.fromObject, this._aro.findArgs()[3]);
-
-						this.areIdentical(b, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOSortByViewsDescThenByTitleAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b1 : any, b2 : any;
-
-				this._setUp();
-
-				b1 = {
-					id : '345',
-					title : 'foo',
-					url : 'google.es',
-					description : 'Marvelous',
-					views : 56
-				};
-				b2 = {
-					id : '675',
-					title : 'bar',
-					url : 'google.de',
-					description : 'Fantastic',
-					views : 43
-				};
-				this._aro.setExecuteSQLOutcome([b1, b2]);
-
-				// Act
-				this._dao.sortByViewsDescThenByTitleAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(
-							'SELECT * FROM ' + DAOTables.Bookmarks + ' ORDER BY views DESC, LOWER(title) ASC',
-							this._aro.executeSQLArgs()[0]
-						);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-
-						this.areIdentical('345', outcome.getAt(0).getId());
-						this.areIdentical('foo', outcome.getAt(0).getTitle());
-						this.areIdentical('google.es', outcome.getAt(0).getURL());
-						this.areIdentical('Marvelous', outcome.getAt(0).getDescription());
-						this.areIdentical(56, outcome.getAt(0).getViews());
-
-						this.areIdentical('675', outcome.getAt(1).getId());
-						this.areIdentical('bar', outcome.getAt(1).getTitle());
-						this.areIdentical('google.de', outcome.getAt(1).getURL());
-						this.areIdentical('Fantastic', outcome.getAt(1).getDescription());
-						this.areIdentical(43, outcome.getAt(1).getViews());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	BookmarkDAOSortByTitleAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var b1 : any, b2 : any;
-
-				this._setUp();
-
-				b1 = {
-					id : '345',
-					title : 'foo',
-					url : 'google.es',
-					description : 'Marvelous',
-					views : 56
-				};
-				b2 = {
-					id : '675',
-					title : 'bar',
-					url : 'google.de',
-					description : 'Fantastic',
-					views : 43
-				};
-				this._aro.setExecuteSQLOutcome([b1, b2]);
-
-				// Act
-				this._dao.sortByTitleAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(
-							'SELECT * FROM ' + DAOTables.Bookmarks + ' ORDER BY LOWER(title) ASC',
-							this._aro.executeSQLArgs()[0]
-						);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-
-						this.areIdentical('345', outcome.getAt(0).getId());
-						this.areIdentical('foo', outcome.getAt(0).getTitle());
-						this.areIdentical('google.es', outcome.getAt(0).getURL());
-						this.areIdentical('Marvelous', outcome.getAt(0).getDescription());
-						this.areIdentical(56, outcome.getAt(0).getViews());
-
-						this.areIdentical('675', outcome.getAt(1).getId());
-						this.areIdentical('bar', outcome.getAt(1).getTitle());
-						this.areIdentical('google.de', outcome.getAt(1).getURL());
-						this.areIdentical('Fantastic', outcome.getAt(1).getDescription());
-						this.areIdentical(43, outcome.getAt(1).getViews());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new BookmarkDAOTest());
diff --git a/testing/models/dao/impl/TagBookmarkDAOTest.ts b/testing/models/dao/impl/TagBookmarkDAOTest.ts
deleted file mode 100644
index 48ba533..0000000
--- a/testing/models/dao/impl/TagBookmarkDAOTest.ts
+++ /dev/null
@@ -1,465 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class TagBookmarkDAOTest extends UnitTestClass {
-	private _aro : Mocks.DAO.ActiveRecordObject;
-	private _dao : TagBookmarkDAO;
-
-	private _setUp() : void {
-		this._aro = new Mocks.DAO.ActiveRecordObject();
-		this._dao = new TagBookmarkDAO(this._aro);
-	}
-
-	private _tearDown() : void {
-		this._aro = null;
-		this._dao = null;
-	}
-
-	TagBookmarkDAOConstructorTest() : void {
-		// Arrange
-		var aro : IActiveRecordObject;
-		var dao : TagBookmarkDAO;
-
-		aro = new Mocks.DAO.ActiveRecordObject();
-	
-		// Act
-		dao = new TagBookmarkDAO(aro);
-	
-		// Assert
-		this.isTrue(TSObject.exists(dao));
-		this.areIdentical(aro, dao.getARO());
-	}
-
-	TagBookmarkAddRelationTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var tag : Tag;
-				var bk : Bookmark;
-
-				this._setUp();
-
-				this._aro.setInsertOutcome(true);
-
-				tag = new Tag();
-				tag.setId('foo');
-				bk = new Bookmark();
-				bk.setId('bar');
-			
-				// Act
-				this._dao.addRelation(
-					tag,
-					bk,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-						this.areIdentical(1, this._aro.insertTimes());
-						this.areIdentical(DAOTables.TagBookmark, this._aro.insertArgs()[0]);
-						this.areIdentical('foo', this._aro.insertArgs()[1].getAt(0));
-						this.areIdentical('bar', this._aro.insertArgs()[1].getAt(1));
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOAddMultipleRelationsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var bk : Bookmark;
-				var tags : IList<Tag>;
-				var t1 : Tag, t2 : Tag;
-
-				this._setUp();
-
-				bk = new Bookmark();
-				bk.setId('foo');
-
-				t1 = new Tag();
-				t1.setId('bar');
-				t2 = new Tag();
-				t2.setId('foobar');
-				tags = new ArrayList<Tag>();
-				tags.add(t1);
-				tags.add(t2);
-
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.addMultipleTagRelations(
-					bk,
-					tags,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-						this.areIdentical(2, this._aro.insertTimes());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOUpdateBookmarkRelationsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var bk : Bookmark;
-				var t1 : Tag, t2 : Tag;
-				var tags : IList<Tag>;
-
-				this._setUp();
-
-				bk = new Bookmark();
-				bk.setId('foo');
-
-				t1 = new Tag();
-				t1.setId('bar');
-				t2 = new Tag();
-				t2.setId('foobar');
-				tags = new ArrayList<Tag>();
-				tags.add(t1);
-				tags.add(t2);
-
-				this._aro.setDeleteOutcome(true);
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.updateBookmarkRelations(
-					bk,
-					tags,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-
-						// Check delete request
-						this.areIdentical(1, this._aro.deleteTimes());
-						this.areIdentical(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
-						this.areIdentical('bookmark_id', this._aro.deleteArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.deleteArgs()[1].getSecond());
-
-						// Check insert requests
-						this.areIdentical(2, this._aro.insertTimes());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAORemoveBookmarkRelationsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var bk : Bookmark;
-
-				this._setUp();
-
-				bk = new Bookmark();
-				bk.setId('foo');
-
-				this._aro.setDeleteOutcome(true);
-
-				// Act
-				this._dao.removeBookmarkRelations(
-					bk,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-
-						// Check delete request
-						this.areIdentical(1, this._aro.deleteTimes());
-						this.areIdentical(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
-						this.areIdentical('bookmark_id', this._aro.deleteArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.deleteArgs()[1].getSecond());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAORemoveTagRelationsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var tag : Tag;
-
-				this._setUp();
-
-				tag = new Tag();
-				tag.setId('foo');
-
-				this._aro.setDeleteOutcome(true);
-
-				// Act
-				this._dao.removeTagRelations(
-					tag,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-
-						// Check delete request
-						this.areIdentical(1, this._aro.deleteTimes());
-						this.areIdentical(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
-						this.areIdentical('tag_id', this._aro.deleteArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.deleteArgs()[1].getSecond());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOGetRawRelationsTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var data : IList<any>;
-				this._setUp();
-
-				data = new ArrayList<any>();
-				data.add({ bookmark_id: 'foo', tag_id: 'bar'});
-				this._aro.setGetOutcome(data);
-
-				// Act
-				this._dao.getRaw(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.getTimes());
-						this.areIdentical(DAOTables.TagBookmark, this._aro.getArgs()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(1, outcome.getLength());
-						this.areIdentical('foo', outcome.getAt(0).bookmark_id);
-						this.areIdentical('bar', outcome.getAt(0).tag_id);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOSortTagsByLabelAscForBookmarkTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var bk : Bookmark;
-				var t1 : any, t2 : any;
-				var request : StringBuffer;
-
-				this._setUp();
-
-				bk = new Bookmark();
-				bk.setId('foo');
-
-				request = new StringBuffer('SELECT * FROM ' + DAOTables.Tags + ' WHERE id IN (');
-				request.append('SELECT tag_id FROM ' + DAOTables.TagBookmark + ' WHERE ');
-				request.append('bookmark_id = "foo") ORDER BY LOWER(label) ASC');
-
-				t1 = {
-					id: 'bar',
-					label: 'foobar'
-				};
-				t2 = {
-					id: 'barbar',
-					label: 'foobarbar'
-				};
-				this._aro.setExecuteSQLOutcome([t1, t2]);
-
-				// Act
-				this._dao.sortTagsByLabelAscForBookmark(
-					bk,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(request.toString(), this._aro.executeSQLArgs()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-						this.areIdentical('bar', outcome.getAt(0).getId());
-						this.areIdentical('foobar', outcome.getAt(0).getLabel());
-						this.areIdentical('barbar', outcome.getAt(1).getId());
-						this.areIdentical('foobarbar', outcome.getAt(1).getLabel());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOSortBookmarksByTitleAcForTagTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-				var b1 : any, b2 : any;
-				var request : StringBuffer;
-
-				this._setUp();
-
-				t = new Tag();
-				t.setId('foo');
-
-				request = new StringBuffer('SELECT * FROM ' + DAOTables.Bookmarks + ' WHERE id IN (');
-				request.append('SELECT bookmark_id FROM ' + DAOTables.TagBookmark + ' WHERE ');
-				request.append('tag_id = "foo") ORDER BY LOWER(title) ASC');
-
-				b1 = {
-					id : '1',
-					url : 'google.uk',
-					title : 'foo',
-					description : 'Wonderful',
-					views : 45
-				};
-				b2 = {
-					id : '2',
-					url : 'google.fr',
-					title : 'bar',
-					description : 'Marvelous',
-					views : 89
-				};
-				this._aro.setExecuteSQLOutcome([b1, b2]);
-
-				// Act
-				this._dao.sortBookmarksByTitleAscForTag(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(request.toString(), this._aro.executeSQLArgs()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-
-						this.areIdentical('1', outcome.getAt(0).getId());
-						this.areIdentical('google.uk', outcome.getAt(0).getURL());
-						this.areIdentical('foo', outcome.getAt(0).getTitle());
-						this.areIdentical('Wonderful', outcome.getAt(0).getDescription());
-						this.areIdentical(45, outcome.getAt(0).getViews());
-
-						this.areIdentical('2', outcome.getAt(1).getId());
-						this.areIdentical('google.fr', outcome.getAt(1).getURL());
-						this.areIdentical('bar', outcome.getAt(1).getTitle());
-						this.areIdentical('Marvelous', outcome.getAt(1).getDescription());
-						this.areIdentical(89, outcome.getAt(1).getViews());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagBookmarkDAOSortBookmarksByTitleAscWithBoundTagsByLabelAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var o1 : any, o2 : any, o3 : any, o4 : any;
-				var request : StringBuffer;
-
-				this._setUp();
-
-				request = new StringBuffer('SELECT bk.id AS id, bk.url as url, bk.title AS title, bk.description AS description, ');
-				request
-					.append('bk.views AS views, outcome.tagId AS tagId, outcome.tagLabel AS tagLabel ')
-					.append('FROM ' + DAOTables.Bookmarks + ' AS bk ')
-					.append('LEFT JOIN (')
-					.append('SELECT t.id AS tagId, t.label AS tagLabel, tbk.bookmark_id AS bkId FROM ')
-					.append(DAOTables.Tags + ' AS t INNER JOIN ')
-					.append(DAOTables.TagBookmark + ' AS tbk ON ')
-					.append('t.id = tbk.tag_id) AS outcome ')
-					.append('ON bk.id = outcome.bkId ')
-					.append('ORDER BY LOWER(bk.title) ASC, LOWER(outcome.tagLabel) ASC');
-
-				o1 = {
-					id : '1',
-					title : 'foo',
-					url : 'google.fr',
-					description : 'Amazing!',
-					views : 56,
-					tagId : '34',
-					tagLabel : 'bar'
-				};
-				o2 = {
-					id : '1',
-					title : 'foo',
-					url : 'google.fr',
-					description : 'Amazing!',
-					views : 56,
-					tagId : '45',
-					tagLabel : 'barbar'
-				};
-				o3 = {
-					id : '2',
-					title : 'foobar',
-					url : 'google.uk',
-					description : 'Formidable!',
-					views : 789
-				};
-				o4 = {
-					id : '2',
-					title : 'foobar',
-					url : 'google.uk',
-					description : 'Formidable!',
-					views : 789,
-					tagId : '35',
-					tagLabel : 'foobarbar'
-				};
-				this._aro.setExecuteSQLOutcome([o1, o2, o3, o4]);
-
-				// Act
-				this._dao.sortBookmarksByTitleAscWithBoundTagsByLabelAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(request.toString(), this._aro.executeSQLArgs()[0]);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-
-						this.areIdentical('1', outcome.getAt(0).getFirst().getId());
-						this.areIdentical('foo', outcome.getAt(0).getFirst().getTitle());
-						this.areIdentical('google.fr', outcome.getAt(0).getFirst().getURL());
-						this.areIdentical('Amazing!', outcome.getAt(0).getFirst().getDescription());
-						this.areIdentical(56, outcome.getAt(0).getFirst().getViews());
-
-						this.areIdentical(2, outcome.getAt(0).getSecond().getLength());
-						this.areIdentical('34', outcome.getAt(0).getSecond().getAt(0).getId());
-						this.areIdentical('bar', outcome.getAt(0).getSecond().getAt(0).getLabel());
-						this.areIdentical('45', outcome.getAt(0).getSecond().getAt(1).getId());
-						this.areIdentical('barbar', outcome.getAt(0).getSecond().getAt(1).getLabel());
-
-						this.areIdentical('2', outcome.getAt(1).getFirst().getId());
-						this.areIdentical('foobar', outcome.getAt(1).getFirst().getTitle());
-						this.areIdentical('google.uk', outcome.getAt(1).getFirst().getURL());
-						this.areIdentical('Formidable!', outcome.getAt(1).getFirst().getDescription());
-						this.areIdentical(789, outcome.getAt(1).getFirst().getViews());
-
-						this.areIdentical(1, outcome.getAt(1).getSecond().getLength());
-						this.areIdentical('35', outcome.getAt(1).getSecond().getAt(0).getId());
-						this.areIdentical('foobarbar', outcome.getAt(1).getSecond().getAt(0).getLabel());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
- 		);
-	}
-}
-
-UnitTestClass.handle(new TagBookmarkDAOTest());
diff --git a/testing/models/dao/impl/TagDAOTest.ts b/testing/models/dao/impl/TagDAOTest.ts
deleted file mode 100644
index 9d0cacc..0000000
--- a/testing/models/dao/impl/TagDAOTest.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class TagDAOTest extends UnitTestClass {
-	private _tagBkDAO : Mocks.DAO.TagBookmarkDAO;
-	private _aro : Mocks.DAO.ActiveRecordObject;
-	private _dao : TagDAO;
-
-	private _setUp() : void {
-		this._tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
-		this._aro = new Mocks.DAO.ActiveRecordObject();
-		this._dao = new TagDAO(this._aro, this._tagBkDAO);
-	}
-
-	private _tearDown() : void {
-		this._tagBkDAO = null;
-		this._aro = null;
-		this._dao = null;
-	}
-
-	TagDAOConstructorTest() : void {
-		// Arrange
-		var tagBkDAO : ITagBookmarkDAO;
-		var aro : IActiveRecordObject;
-		var outcome : TagDAO;
-
-		tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
-		aro = new Mocks.DAO.ActiveRecordObject();
-	
-		// Act
-		outcome = new TagDAO(aro, tagBkDAO);
-	
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical(aro, outcome.getARO());
-	}
-
-	TagDAOAddTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag();
-				t.setId('useless');
-				t.setLabel('foo');
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.add(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.insertTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.insertArgs()[0]);
-						this.areIdentical(2, this._aro.insertArgs()[1].getLength());
-						this.areNotIdentical('useless', this._aro.insertArgs()[1].getAt(0));
-						this.areIdentical('foo', this._aro.insertArgs()[1].getAt(1));
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areNotIdentical('useless', outcome.getId());
-						this.areIdentical('foo', outcome.getLabel());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOAddRawTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag();
-				t.setId('bar');
-				t.setLabel('foo');
-				this._aro.setInsertOutcome(true);
-
-				// Act
-				this._dao.addRaw(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.insertTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.insertArgs()[0]);
-						this.areIdentical(2, this._aro.insertArgs()[1].getLength());
-						this.areIdentical('bar', this._aro.insertArgs()[1].getAt(0));
-						this.areIdentical('foo', this._aro.insertArgs()[1].getAt(1));
-
-						this.isTrue(outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOUpdateTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-				t = new Tag();
-				t.setId('foo').setLabel('bar');
-
-				this._aro.setUpdateOutcome(true);
-
-				// Act
-				this._dao.update(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.updateTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.updateArgs()[0]);
-
-						this.areIdentical('id', this._aro.updateArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.updateArgs()[1].getSecond());
-
-						this.areIdentical(1, this._aro.updateArgs()[2].getLength());
-						this.areIdentical('bar', this._aro.updateArgs()[2].get('label'));
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(t, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAODeleteTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setId('foo');
-				this._tagBkDAO.setRemoveTagRelationsOutcome(true);
-				this._aro.setDeleteOutcome(true);
-
-				// Act
-				this._dao.delete(
-					t,
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._tagBkDAO.removeTagRelationsTimes());
-						this.areIdentical(t, this._tagBkDAO.removeTagRelationsArgs()[0]);
-
-						this.areIdentical(1, this._aro.deleteTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.deleteArgs()[0]);
-						this.areIdentical('id', this._aro.deleteArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.deleteArgs()[1].getSecond());
-
-						this.isTrue(outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOGetTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var l : IList<Tag>;
-
-				this._setUp();
-
-				l = new ArrayList<Tag>();
-				l.add(new Tag().setId('foo'));
-				l.add(new Tag().setId('bar'));
-				this._aro.setGetOutcome(l);
-
-				// Act
-				this._dao.get(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.getTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.getArgs()[0]);
-						this.areIdentical(Tag.fromObject, this._aro.getArgs()[2]);
-						this.areIdentical(l, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOFindTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setId('foo');
-				this._aro.setFindOutcome(t);
-
-				// Act
-				this._dao.find(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.findTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.findArgs()[0]);
-						this.areIdentical('id', this._aro.findArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.findArgs()[1].getSecond());
-						this.areIdentical(Tag.fromObject, this._aro.findArgs()[3]);
-						this.areIdentical(t, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOFindByLabelTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t : Tag;
-
-				this._setUp();
-
-				t = new Tag().setLabel('foo');
-				this._aro.setFindOutcome(t);
-
-				// Act
-				this._dao.findByLabel(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.findTimes());
-						this.areIdentical(DAOTables.Tags, this._aro.findArgs()[0]);
-						this.areIdentical('label', this._aro.findArgs()[1].getFirst());
-						this.areIdentical('foo', this._aro.findArgs()[1].getSecond());
-						this.areIdentical(Tag.fromObject, this._aro.findArgs()[3]);
-						this.areIdentical(t, outcome);
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	TagDAOSortByLabelAscTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var t1 : any, t2 : any;
-
-				this._setUp();
-
-				t1 = {
-					id : 'foo',
-					label : 'bar'
-				};
-				t2 = {
-					id : 'barbar',
-					label : 'foobar'
-				};
-				this._aro.setExecuteSQLOutcome([t1, t2]);
-
-				// Act
-				this._dao.sortByLabelAsc(
-					(outcome) => {
-						// Assert
-						this.areIdentical(1, this._aro.executeSQLTimes());
-						this.areIdentical(
-							'SELECT * FROM ' + DAOTables.Tags + ' ORDER BY LOWER(label) ASC',
-							this._aro.executeSQLArgs()[0]
-						);
-
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-						this.areIdentical('foo', outcome.getAt(0).getId());
-						this.areIdentical('bar', outcome.getAt(0).getLabel());
-						this.areIdentical('barbar', outcome.getAt(1).getId());
-						this.areIdentical('foobar', outcome.getAt(1).getLabel());
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new TagDAOTest());
diff --git a/testing/output/libs/jquery.1.10.2.js b/testing/output/libs/jquery.1.10.2.js
deleted file mode 100644
index 76d21a4..0000000
--- a/testing/output/libs/jquery.1.10.2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery-1.10.2.min.map
-*/
-(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
-}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
-u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
\ No newline at end of file
diff --git a/testing/output/output.html b/testing/output/output.html
deleted file mode 100644
index 8308b45..0000000
--- a/testing/output/output.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html class="no-js">
-    <head>
-        <title>UnitTesting output</title>
-        <link rel="stylesheet" type="text/css" href="testing.css">
-    </head>
-    <body>
-        <div id="outcome"></div>
-
-        <script type="text/javascript" src="libs/jquery.1.10.2.js"></script>
-        <script type="text/javascript" src="test_output.js"></script>
-        <script type="text/javascript">
-        	UnitTestClass.run();
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/testing/output/testing.scss b/testing/output/testing.scss
deleted file mode 100644
index b227a87..0000000
--- a/testing/output/testing.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-h1, h2, p, li {
-	font-family : 'Helvetica Neue', 'Helvetica', 'Arial', serif;
-} 
-
-h1 {
-	font-size : 2em;
-	color : #343838;
-}
-
-h2 {
-	font-size : 1.8em;
-	color: #343838;
-}
-
-p, li {
-	font-size : 1em;
-	color : #424242;
-}
-
-article > p {
-	font-size: 1.5em;
-}
-
-#tsUnitTotalCout {
-	color: #FF9900;
-	font-weight: bold;
-}
-
-#tsUnitPassCount {
-	color : #8FBE00;
-	font-weight: bold;
-}
-
-#tsUnitFailCount {
-	font-weight: bold;
-	color: #CC333F;
-}
-
-ul.bad li {
-	color : #CC333F;
-}
\ No newline at end of file
diff --git a/testing/helpers/SecurityHelperTest.ts b/testing/src/helpers/SecurityHelperTest.ts
similarity index 58%
rename from testing/helpers/SecurityHelperTest.ts
rename to testing/src/helpers/SecurityHelperTest.ts
index b8d44a3..c2949ab 100644
--- a/testing/helpers/SecurityHelperTest.ts
+++ b/testing/src/helpers/SecurityHelperTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 class SecurityHelperTest extends UnitTestClass {
 	setUp() : void {
@@ -16,14 +16,12 @@ class SecurityHelperTest extends UnitTestClass {
 		var outcome : string;
 
 		s = '<script>alert("I\'ve broken your website!");</script>';
-		expected = '&lt;script&gt;alert("I\'ve broken your website!");&lt;/script&gt;';
+		expected = '&lt;script&gt;alert(&quot;I\'ve broken your website!&quot;);&lt;/script&gt;';
 
 		// Act
 		outcome = SecurityHelper.disarm(s);
 
 		// Assert
-		this.areIdentical(expected.toLowerCase(), outcome.toLowerCase());
+		Assert.isTrue(StringHelper.compare(expected, outcome));
 	}
 }
-
-UnitTestClass.handle(new SecurityHelperTest());
diff --git a/testing/helpers/URLDetailsProviderTest.ts b/testing/src/helpers/URLDetailsProviderTest.ts
similarity index 50%
rename from testing/helpers/URLDetailsProviderTest.ts
rename to testing/src/helpers/URLDetailsProviderTest.ts
index b733dfe..1d5a7eb 100644
--- a/testing/helpers/URLDetailsProviderTest.ts
+++ b/testing/src/helpers/URLDetailsProviderTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 class URLDetailsProviderTest extends UnitTestClass {
 	setUp() : void {
@@ -9,7 +9,7 @@ class URLDetailsProviderTest extends UnitTestClass {
 
 	}
 
-	URLDetailsProviderGetDetailsTest() : void {
+	URLDetailsProviderGetDetailsAsyncTest(obs : IOscarObserver) : void {
 		// Arrange
 		var url : string;
 
@@ -20,20 +20,16 @@ class URLDetailsProviderTest extends UnitTestClass {
 			url,
 			(title, description) => {
 				// Assert
-				this.areIdentical('Google', title);
+				Assert.areEqual('Google', title);
+				obs.success();
 			},
 			(type, msg) => {
-				Log.error(
-					new Exception(
-						'Error occured in URLDetailsProvider with type ' + type + ' and following message: ' + msg
-					)
-				);
-				this.fail();
+				obs.fail(new Error(msg));
 			}
 		);
 	}
 
-	URLDetailsProviderGetDetailsBadURLTest() : void {
+	URLDetailsProviderGetDetailsBadURLAsyncTest(obs : IOscarObserver) : void {
 		// Arrange
 		var url : string = 'ABadUrl';
 
@@ -41,14 +37,13 @@ class URLDetailsProviderTest extends UnitTestClass {
 		URLDetailsProvider.getDetails(
 			url,
 			(title, description) => {
-				this.fail();
+				obs.fail();
 			},
 			(type, msg) => {
 				// Assert
-				this.areIdentical(URLDetailsProviderError.BadURL, type);
+				Assert.areEqual(URLDetailsProviderError.BadURL, type);
+				obs.success();
 			}
 		);
 	}
 }
-
-UnitTestClass.handle(new URLDetailsProviderTest());
diff --git a/testing/helpers/URLHelperTest.ts b/testing/src/helpers/URLHelperTest.ts
similarity index 83%
rename from testing/helpers/URLHelperTest.ts
rename to testing/src/helpers/URLHelperTest.ts
index 62ee3e4..83624f7 100644
--- a/testing/helpers/URLHelperTest.ts
+++ b/testing/src/helpers/URLHelperTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 class URLHelperTest extends UnitTestClass {
 	setUp() : void {
@@ -20,7 +20,7 @@ class URLHelperTest extends UnitTestClass {
 		isValid = URLHelper.isValid(s);
 
 		// Assert
-		this.isTrue(isValid);
+		Assert.isTrue(isValid);
 	}
 
 	URLHelperIsValidInvalidURLTest() : void {
@@ -34,7 +34,7 @@ class URLHelperTest extends UnitTestClass {
 		isValid = URLHelper.isValid(s);
 
 		// Assert
-		this.isFalse(isValid);
+		Assert.isFalse(isValid);
 	}
 
 	URLHelperBuildAbsoluteTest() : void {
@@ -48,7 +48,7 @@ class URLHelperTest extends UnitTestClass {
 		outcome = URLHelper.buildAbsolute(s, url);
 
 		// Assert
-		this.areIdentical(expected, outcome);
+		Assert.areEqual(expected, outcome);
 	}
 
 	URLHelperBuildAbsoluteWithoutSlashTest() : void {
@@ -62,7 +62,7 @@ class URLHelperTest extends UnitTestClass {
 		outcome = URLHelper.buildAbsolute(s, url);
 
 		// Assert
-		this.areIdentical(expected, outcome);
+		Assert.areEqual(expected, outcome);
 	}
 
 	URLHelperBuildAbsoluteAlreadyAbsoluteTest() : void {
@@ -76,8 +76,6 @@ class URLHelperTest extends UnitTestClass {
 		outcome = URLHelper.buildAbsolute(s, url);
 
 		// Assert
-		this.areIdentical(expected, outcome);
+		Assert.areEqual(expected, outcome);
 	}
 }
-
-UnitTestClass.handle(new URLHelperTest());
diff --git a/testing/src/libs/oscar.1.0.2.min.ts b/testing/src/libs/oscar.1.0.2.min.ts
new file mode 100755
index 0000000..09096b0
--- /dev/null
+++ b/testing/src/libs/oscar.1.0.2.min.ts
@@ -0,0 +1 @@
+module Oscar { export interface IOscarObserverListener { onSuccess() : void; onFail(error? : Error) : void; } }module Oscar { export class OscarObserver implements IOscarObserver { private _isStopped : boolean; private _listener : Oscar.IOscarObserverListener; constructor(listener : Oscar.IOscarObserverListener) { this._listener = listener; this._isStopped = false; } success() : void { if (!this._isStopped) { setTimeout( () => { if (!this._isStopped) { this._isStopped = true; this._listener.onSuccess(); } }, 0 ); } } fail(error? : Error) : void { if (!this._isStopped) { setTimeout( () => { if (!this._isStopped) { this._isStopped = true; this._listener.onFail(error); } }, 0 ); } } stop() : void { this._isStopped = true; } } }module Oscar { export class TestClass { private _core : UnitTestClass; private _methods : Array<TestMethod>; constructor(core : UnitTestClass) { this._core = core; this._methods = new Array<TestMethod>(); } getName() : string { return <string> (<any> this._core).constructor.name; } getCore() : UnitTestClass { return this._core; } addMethod(value : TestMethod) : TestClass { this._methods.push(value); return this; } getMethods() : Array<TestMethod> { return this._methods; } } }module Oscar { export class TestMethod { private _name : string; private _core : () => void; private _isAsync : boolean; private _observer : Oscar.OscarObserver; private _success : boolean; private _error : Error; private _time : number; constructor(name : string, core : () => void, isAsync : boolean = false) { this._name = name; this._core = core; this._isAsync = isAsync; } getName() : string { return this._name; } getCore() : () => void { return this._core; } isAsync() : boolean { return this._isAsync; } getObserver() : Oscar.OscarObserver { return this._observer; } setObserver(observer : Oscar.OscarObserver) : void { this._observer = observer; } isSuccess() : boolean { return this._success; } setSuccess(value : boolean) : void { this._success = value; } getError() : Error { if (this._error !== null && this._error !== undefined) { return this._error; } return new Error('Unknown error'); } setError(value : Error) : void { this._error = value; } getTime() : number { return this._time; } setStart() : void { this._time = new Date().getTime(); } setEnd() : void { this._time = (new Date().getTime()) - this._time; } } }module Oscar { export class Utils { static shuffleArray<T>(a : Array<T>) : void { var n : number; var f : (min : number, max : number) => number; f = (min, max) => { return Math.round(Math.random() * max) + min; }; n = f(a.length, a.length * a.length); while (n >= 0) { var i : number, j : number; var tmp : T; i = f(0, a.length - 1); j = f(0, a.length - 1); tmp = a[i]; a[i] = a[j]; a[j] = tmp; n--; } } } }class Assert { static isTrue(value : boolean) : void { if (!value) { throw new Error('Expected value to be true'); } } static isFalse(value : boolean) : void { if (value) { throw new Error('Expected value to be false'); } } static isNull<T>(value : T) : void { if (value !== null && value !== undefined) { throw new Error('Expected value to be null'); } } static isNotNull<T>(value : T) : void { if (value === null || value === undefined) { throw new Error('Expected value to be not null'); } } static areEqual<T>(expected : T, value : T) : void { if (value !== expected) { throw new Error('Expected ' + expected + ' instead of ' + value); } } static areNotEqual<T>(unexpected : T, value : T) : void { if (value === unexpected) { throw new Error('Unexpected ' + unexpected + ' instead of ' + value); } } static throws(func : () => void) : void { var hasFailed : boolean; hasFailed = false; try { func(); } catch (e) { hasFailed = true; } finally { if (!hasFailed) { throw new Error('Expected function to throw an error'); } } } }interface IOscarObserver { success() : void; fail(error? : Error) : void; }class UnitTestClass { setUp() : void { } tearDown() : void { } }enum TestSuiteOutput { CONSOLE, HTML } declare var process : any; class TestSuite implements Oscar.IOscarObserverListener { private _collected : Array<Oscar.TestClass>; private _totalTests : number; private _successfulTests : number; private _totalRuntime : number; private _output : TestSuiteOutput; private _maxRuntime : number; private _buildFailure : boolean; private _currentTestClass : Oscar.TestClass; private _currentTestClassIndex : number; private _currentTestMethodIndex : number; private _currentAsyncTest : Oscar.TestMethod; private _asyncTimer : any; constructor() { this._collected = new Array<Oscar.TestClass>(); } private _moveToNextTest() : void { this._currentTestMethodIndex++; if (this._currentTestMethodIndex < this._currentTestClass.getMethods().length) { this._runSingleTest(this._currentTestClass.getMethods()[this._currentTestMethodIndex]); } else { this._handleClass(); } } private _runSingleTest(test : Oscar.TestMethod) : void { if (test.isAsync()) { var hasFailed : boolean; this._currentAsyncTest = test; test.setObserver(new Oscar.OscarObserver(this)); try { test.setStart(); this._currentTestClass.getCore().setUp(); test.getCore().call(this._currentTestClass.getCore(), test.getObserver()); hasFailed = false; } catch (e) { try { this._currentTestClass.getCore().tearDown(); } catch (e) { } test.setEnd(); test.setSuccess(false); test.setError(e); hasFailed = true; } finally { if (hasFailed) { test.getObserver().stop(); this._totalTests++; this._totalRuntime += test.getTime(); this._moveToNextTest(); } else { this._asyncTimer = setTimeout(() => { test.getObserver().stop(); this.onFail(new Error('Maximum runtime exceeded')); }, this._maxRuntime); } } } else { try { test.setStart(); this._currentTestClass.getCore().setUp(); test.getCore().call(this._currentTestClass.getCore()); this._currentTestClass.getCore().tearDown(); test.setEnd(); test.setSuccess(true); } catch (e) { try { this._currentTestClass.getCore().tearDown(); } catch (e) { } test.setEnd(); test.setSuccess(false); test.setError(e); } finally { if (test.isSuccess()) { this._successfulTests++; } this._totalTests++; this._totalRuntime += test.getTime(); this._moveToNextTest(); } } } private _handleClass() : void { var methods : Array<Oscar.TestMethod>; this._currentTestClassIndex++; if (this._currentTestClassIndex >= this._collected.length) { this._onRunOver(); return; } this._currentTestClass = this._collected[this._currentTestClassIndex]; methods = this._currentTestClass.getMethods(); if (methods.length < 1) { this._handleClass(); return; } Oscar.Utils.shuffleArray(methods); this._currentTestMethodIndex = 0; this._runSingleTest(methods[0]); } private _onRunOver() : void { var failedTests : number; var sortMethod : (a : Oscar.TestMethod, b : Oscar.TestMethod) => number; failedTests = this._totalTests - this._successfulTests; this._collected.sort( (a, b) => { if (a.getName() > b.getName()) { return 1; } else if (a.getName() < b.getName()) { return -1; } else { return 0; } } ); sortMethod = (a, b) => { if (a.getName() > b.getName()) { return 1; } else if (a.getName() < b.getName()) { return -1; } else { return 0; } }; for (var i = 0; i < this._collected.length; i++) { this._collected[i].getMethods().sort(sortMethod); } if (this._output === TestSuiteOutput.CONSOLE) { console.log('--- Unit testing sum up ---'); if (this._totalRuntime < 1) { console.log('Total: ' + this._totalTests + ' run in less than 1ms.'); } else { console.log('Total: ' + this._totalTests + ' run in ' + this._totalRuntime + 'ms.'); } console.log('Passed tests: ' + this._successfulTests); console.log('Failed tests: ' + failedTests + '\n'); for (var i = 0; i < this._collected.length; i++) { var testClass : Oscar.TestClass; testClass = this._collected[i]; console.log(testClass.getName() + ':'); for (var j = 0; j < testClass.getMethods().length; j++) { var testMethod : Oscar.TestMethod; testMethod = testClass.getMethods()[j]; if (testMethod.isSuccess()) { if (testMethod.getTime() < 1) { console.log('\t' + testMethod.getName() + ' - less than 1ms'); } else { console.log('\t' + testMethod.getName() + ' - ' + testMethod.getTime() + 'ms'); } } else { console.error('\t' + testMethod.getName() + ' FAILED'); console.error('\t\t' + testMethod.getError().toString()); } } } } else { var outcome : string; outcome = '<h1>Unit testing sum up</h1>'; outcome += '<p class="sum-up">Total tests: <span class="total">' + this._totalTests + '</span>. '; outcome += 'Passed tests: <span class="success">' + this._successfulTests + '</span>. '; outcome += 'Failed tests: <span class="fail">' + failedTests + '</span>.</p>'; outcome += '<p>Total: '; if (this._totalRuntime < 1) { outcome += 'less than 1'; } else { outcome += this._totalRuntime; } outcome += 'ms</p>'; outcome += '<ul>'; for (var i = 0; i < this._collected.length; i++) { var testClass : Oscar.TestClass; testClass = this._collected[i]; outcome += '<li class="test-class">' + testClass.getName() + '<ul>'; for (var j = 0; j < testClass.getMethods().length; j++) { var testMethod : Oscar.TestMethod; testMethod = testClass.getMethods()[j]; outcome += '<li class="test-method '; if (testMethod.isSuccess()) { outcome += ' success">' + testMethod.getName() + ' - '; if (testMethod.getTime() < 1) { outcome += 'less than 1'; } else { outcome += testMethod.getTime(); } outcome += 'ms'; } else { outcome += 'fail">' + testMethod.getName() + ' FAILED'; outcome += '<p class="error">' + testMethod.getError().toString() + '</p>'; } outcome += '</li>'; } outcome += '</ul></li>'; } outcome += '</ul>'; if (document.body !== null && document.body !== undefined) { document.body.innerHTML += outcome; } else { document.documentElement.innerHTML += '<body>' + outcome + '</body>'; } } if (failedTests > 0 && this._buildFailure) { if (process !== null && process !== undefined) { process.exit(1); } } } private _processFailure(error : Error) : void { this._currentAsyncTest.setEnd(); this._currentAsyncTest.setSuccess(false); this._currentAsyncTest.setError(error); this._totalRuntime += this._currentAsyncTest.getTime(); this._totalTests++; this._moveToNextTest(); } add(test : UnitTestClass) : TestSuite { var testClass : Oscar.TestClass; testClass = new Oscar.TestClass(test); for (var name in test) { var prop : any; var l : number; prop = test[name]; l = name.length; if (typeof(prop) === 'function') { if (l > 4) { var suffix : string; suffix = name.substring(l - 4, l).toLowerCase(); if (suffix === 'test') { var testMethod : Oscar.TestMethod; if (l > 9) { var extendedSuffix : string; extendedSuffix = name.substring(l - 9, l - 4).toLowerCase(); if (extendedSuffix === 'async') { testMethod = new Oscar.TestMethod(name, prop, true); } else { testMethod = new Oscar.TestMethod(name, prop, false); } } else { testMethod = new Oscar.TestMethod(name, prop, false); } testClass.addMethod(testMethod); } } } } this._collected.push(testClass); return this; } run(output? : TestSuiteOutput, maxRuntime? : number, buildFailure? : boolean) : void { if (output !== null && output !== undefined) { this._output = output; } else { this._output = TestSuiteOutput.CONSOLE; } if (maxRuntime !== null && maxRuntime !== undefined) { this._maxRuntime = maxRuntime; } else { this._maxRuntime = 30 * 1000; } if (buildFailure !== null && buildFailure !== undefined) { this._buildFailure = buildFailure; } else { this._buildFailure = true; } if (this._collected.length < 1) { throw new Error('No test collected'); } this._totalTests = 0; this._successfulTests = 0; this._totalRuntime = 0; Oscar.Utils.shuffleArray(this._collected); this._currentTestClassIndex = -1; this._handleClass(); } onSuccess() : void { var isTearDownOk : boolean; var error : Error; clearTimeout(this._asyncTimer); this._asyncTimer = null; try { this._currentTestClass.getCore().tearDown(); isTearDownOk = true; } catch (e) { error = e; isTearDownOk = false; } if (!isTearDownOk) { this._processFailure(error); return; } this._currentAsyncTest.setEnd(); this._currentAsyncTest.setSuccess(true); this._successfulTests++; this._totalTests++; this._totalRuntime += this._currentAsyncTest.getTime(); this._moveToNextTest(); } onFail(error? : Error) : void { clearTimeout(this._asyncTimer); this._asyncTimer = null; try { this._currentTestClass.getCore().tearDown(); } catch (e) { } this._processFailure(error); } }
\ No newline at end of file
diff --git a/testing/mocks/ARO.ts b/testing/src/mocks/ARO.ts
similarity index 97%
rename from testing/mocks/ARO.ts
rename to testing/src/mocks/ARO.ts
index 4561416..db46453 100644
--- a/testing/mocks/ARO.ts
+++ b/testing/src/mocks/ARO.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 module Mocks {
 	export module ARO {
diff --git a/testing/mocks/Business.ts b/testing/src/mocks/Business.ts
similarity index 97%
rename from testing/mocks/Business.ts
rename to testing/src/mocks/Business.ts
index 87620de..813d463 100644
--- a/testing/mocks/Business.ts
+++ b/testing/src/mocks/Business.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 module Mocks {
 	export module Business {
diff --git a/testing/mocks/DAO.ts b/testing/src/mocks/DAO.ts
similarity index 99%
rename from testing/mocks/DAO.ts
rename to testing/src/mocks/DAO.ts
index f160553..8fa6a3d 100644
--- a/testing/mocks/DAO.ts
+++ b/testing/src/mocks/DAO.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 module Mocks {
 	export module DAO {
diff --git a/testing/mocks/Utils.ts b/testing/src/mocks/Utils.ts
similarity index 82%
rename from testing/mocks/Utils.ts
rename to testing/src/mocks/Utils.ts
index 404c603..c364d2e 100644
--- a/testing/mocks/Utils.ts
+++ b/testing/src/mocks/Utils.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 module Mocks {
 	export module Utils {
@@ -7,6 +7,12 @@ module Mocks {
 			firstName : string;
 			lastName : string;
 
+			constructor(firstName? : string, lastName? : string) {
+				super();
+				this.firstName = firstName;
+				this.lastName = lastName;
+			}
+
 			static toPerson(o : any) : Person {
 				var p : Person = new Person();
 				p.id = o.id;
diff --git a/testing/models/beans/BookmarkTest.ts b/testing/src/models/beans/BookmarkTest.ts
similarity index 60%
rename from testing/models/beans/BookmarkTest.ts
rename to testing/src/models/beans/BookmarkTest.ts
index 0540468..2ec6b8a 100644
--- a/testing/models/beans/BookmarkTest.ts
+++ b/testing/src/models/beans/BookmarkTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../test_dependencies.ts" />
+/// <reference path="../../references.ts" />
 
 class BookmarkTest extends UnitTestClass {
 	private _bookmark : Bookmark;
@@ -21,7 +21,7 @@ class BookmarkTest extends UnitTestClass {
 		outcome = this._bookmark.getId();
 
 		// Arrange
-		this.areIdentical(id, outcome);
+		Assert.areEqual(id, outcome);
 	}
 
 	BookmarkURLTest() : void {
@@ -32,7 +32,7 @@ class BookmarkTest extends UnitTestClass {
 		this._bookmark.setURL(url);
 
 		// Assert
-		this.areIdentical(url, this._bookmark.getURL());
+		Assert.areEqual(url, this._bookmark.getURL());
 	}
 
 	BookmarkTitleTest() : void {
@@ -43,7 +43,7 @@ class BookmarkTest extends UnitTestClass {
 		this._bookmark.setTitle(title);
 
 		// Assert
-		this.areIdentical(title, this._bookmark.getTitle());
+		Assert.areEqual(title, this._bookmark.getTitle());
 	}
 
 	BookmarkDescriptionTest() : void {
@@ -57,7 +57,7 @@ class BookmarkTest extends UnitTestClass {
 		this._bookmark.setDescription(description.toString());
 
 		// Assert
-		this.areIdentical(description.toString(), this._bookmark.getDescription());
+		Assert.areEqual(description.toString(), this._bookmark.getDescription());
 	}
 
 	BookmarkViewsTest() : void {
@@ -68,7 +68,7 @@ class BookmarkTest extends UnitTestClass {
 		this._bookmark.setViews(value);
 
 		// Assert
-		this.areIdentical(value, this._bookmark.getViews());
+		Assert.areEqual(value, this._bookmark.getViews());
 	}
 
 	BookmarkToListTest() : void {
@@ -90,13 +90,13 @@ class BookmarkTest extends UnitTestClass {
 		outcome = this._bookmark.toList();
 
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical(5, outcome.getLength());
-		this.areIdentical(id, outcome.getAt(0));
-		this.areIdentical(url, outcome.getAt(1));
-		this.areIdentical(title, outcome.getAt(2));
-		this.areIdentical(description, outcome.getAt(3));
-		this.areIdentical(views, outcome.getAt(4));
+		Assert.isNotNull(outcome);
+		Assert.areEqual(5, outcome.getLength());
+		Assert.areEqual(id, outcome.getAt(0));
+		Assert.areEqual(url, outcome.getAt(1));
+		Assert.areEqual(title, outcome.getAt(2));
+		Assert.areEqual(description, outcome.getAt(3));
+		Assert.areEqual(views, outcome.getAt(4));
 	}
 
 	BookmarkFromObjectTest() : void {
@@ -114,12 +114,12 @@ class BookmarkTest extends UnitTestClass {
 		outcome = Bookmark.fromObject(o);
 
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical('5', outcome.getId());
-		this.areIdentical('foo', outcome.getURL());
-		this.areIdentical('bar', outcome.getTitle());
-		this.areIdentical('foobar', outcome.getDescription());
-		this.areIdentical(45, outcome.getViews());
+		Assert.isNotNull(outcome);
+		Assert.areEqual('5', outcome.getId());
+		Assert.areEqual('foo', outcome.getURL());
+		Assert.areEqual('bar', outcome.getTitle());
+		Assert.areEqual('foobar', outcome.getDescription());
+		Assert.areEqual(45, outcome.getViews());
 	}
 
 	BookmarkToJSONTest() : void {
@@ -136,12 +136,12 @@ class BookmarkTest extends UnitTestClass {
 		outcome = this._bookmark.toJSON();
 	
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical('foo', outcome.id);
-		this.areIdentical('bar', outcome.url);
-		this.areIdentical('barbar', outcome.title);
-		this.areIdentical('foobar', outcome.description);
-		this.areIdentical(465, outcome.views);
+		Assert.isNotNull(outcome);
+		Assert.areEqual('foo', outcome.id);
+		Assert.areEqual('bar', outcome.url);
+		Assert.areEqual('barbar', outcome.title);
+		Assert.areEqual('foobar', outcome.description);
+		Assert.areEqual(465, outcome.views);
 	}
 
 	BookmarkHydrateTest() : void {
@@ -159,12 +159,10 @@ class BookmarkTest extends UnitTestClass {
 		source.hydrate(this._bookmark);
 
 		// Assert
-		this.areIdentical(source.getId(), this._bookmark.getId());
-		this.areIdentical(source.getURL(), this._bookmark.getURL());
-		this.areIdentical(source.getTitle(), this._bookmark.getTitle());
-		this.areIdentical(source.getDescription(), this._bookmark.getDescription());
-		this.areIdentical(source.getViews(), this._bookmark.getViews());
+		Assert.areEqual(source.getId(), this._bookmark.getId());
+		Assert.areEqual(source.getURL(), this._bookmark.getURL());
+		Assert.areEqual(source.getTitle(), this._bookmark.getTitle());
+		Assert.areEqual(source.getDescription(), this._bookmark.getDescription());
+		Assert.areEqual(source.getViews(), this._bookmark.getViews());
 	}
 }
-
-UnitTestClass.handle(new BookmarkTest());
diff --git a/testing/models/beans/TagTest.ts b/testing/src/models/beans/TagTest.ts
similarity index 63%
rename from testing/models/beans/TagTest.ts
rename to testing/src/models/beans/TagTest.ts
index f8272e9..83bcf01 100644
--- a/testing/models/beans/TagTest.ts
+++ b/testing/src/models/beans/TagTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../test_dependencies.ts" />
+/// <reference path="../../references.ts" />
 
 class TagTest extends UnitTestClass {
 	private _tag : Tag;
@@ -22,7 +22,7 @@ class TagTest extends UnitTestClass {
 		outcome = this._tag.getId();
 
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 
 	TagLabelTest() : void {
@@ -33,7 +33,7 @@ class TagTest extends UnitTestClass {
 		this._tag.setLabel(label);
 
 		// Assert
-		this.areIdentical(label, this._tag.getLabel());
+		Assert.areEqual(label, this._tag.getLabel());
 	}
 
 	TagToListTest() : void {
@@ -49,10 +49,10 @@ class TagTest extends UnitTestClass {
 		outcome = this._tag.toList();
 
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical(2, outcome.getLength());
-		this.areIdentical(id, outcome.getAt(0));
-		this.areIdentical(label, outcome.getAt(1));
+		Assert.isNotNull(outcome);
+		Assert.areEqual(2, outcome.getLength());
+		Assert.areEqual(id, outcome.getAt(0));
+		Assert.areEqual(label, outcome.getAt(1));
 	}
 
 	TagFromObjectTest() : void {
@@ -67,9 +67,9 @@ class TagTest extends UnitTestClass {
 		outcome = Tag.fromObject(source);
 	
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical('foo', outcome.getId());
-		this.areIdentical('bar', outcome.getLabel());
+		Assert.isNotNull(outcome);
+		Assert.areEqual('foo', outcome.getId());
+		Assert.areEqual('bar', outcome.getLabel());
 	}
 
 	TagToJSONTest() : void {
@@ -83,9 +83,9 @@ class TagTest extends UnitTestClass {
 		outcome = this._tag.toJSON();
 	
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical('foo', outcome.id);
-		this.areIdentical('bar', outcome.label);
+		Assert.isNotNull(outcome);
+		Assert.areEqual('foo', outcome.id);
+		Assert.areEqual('bar', outcome.label);
 	}
 
 	TagHydrateTest() : void {
@@ -100,9 +100,7 @@ class TagTest extends UnitTestClass {
 		source.hydrate(this._tag);
 	
 		// Assert
-		this.areIdentical(source.getId(), this._tag.getId());
-		this.areIdentical(source.getLabel(), this._tag.getLabel());
+		Assert.areEqual(source.getId(), this._tag.getId());
+		Assert.areEqual(source.getLabel(), this._tag.getLabel());
 	}
 }
-
-UnitTestClass.handle(new TagTest());
diff --git a/testing/src/models/business/impl/BookmarkBusinessTest.ts b/testing/src/models/business/impl/BookmarkBusinessTest.ts
new file mode 100644
index 0000000..342c7c0
--- /dev/null
+++ b/testing/src/models/business/impl/BookmarkBusinessTest.ts
@@ -0,0 +1,268 @@
+/// <reference path="../../../references.ts" />
+
+class BookmarkBusinessTest extends UnitTestClass {
+	private _dao : Mocks.DAO.BookmarkDAO;
+	private _business : BookmarkBusiness;
+
+	setUp() : void {
+		this._dao = new Mocks.DAO.BookmarkDAO();
+		this._business = new BookmarkBusiness(this._dao);
+	}
+
+	tearDown() : void {
+		this._dao = null;
+		this._business = null;
+	}
+
+	BookmarkBusinessConstructorTest() : void {
+		// Arrange
+		var dao : IBookmarkDAO;
+		var outcome : BookmarkBusiness;
+
+		dao = new Mocks.DAO.BookmarkDAO();
+	
+		// Act
+		outcome = new BookmarkBusiness(dao);
+	
+		// Assert
+		Assert.isNotNull(outcome);
+	}
+
+	//region EngineBookmark
+
+	BookmarkBusinessEngineBookmarkTest() : void {
+		// Arrange
+		var b : Bookmark;
+	
+		b = new Bookmark();
+		b
+			.setId('  <foo ')
+			.setTitle(' >>foo  ')
+			.setURL(' http://google.fr"  ')
+			.setDescription(' <<barbar ');
+
+		// Act
+		this._business.engineBookmark(b);
+	
+		// Assert
+		Assert.isNotNull(b);
+		Assert.areEqual('&lt;foo', b.getId());
+		Assert.areEqual('&gt;&gt;foo', b.getTitle());
+		Assert.areEqual('http://google.fr&quot;', b.getURL());
+		Assert.areEqual('&lt;&lt;barbar', b.getDescription());
+	}
+
+	BookmarkBusinessEngineBookmarkNoTitleTest() : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setURL('>>foo  ');
+	
+		// Act
+		this._business.engineBookmark(b);
+	
+		// Assert
+		Assert.areEqual('&gt;&gt;foo', b.getTitle());
+	}
+
+	BookmarkBusinessEngineBookmarkEmptyTitleTest() : void {
+		// Arrange
+		var b : Bookmark;
+		b = new Bookmark().setURL('>>foo  ').setTitle('');
+	
+		// Act
+		this._business.engineBookmark(b);
+	
+		// Assert
+		Assert.areEqual('&gt;&gt;foo', b.getTitle());
+	}
+
+	BookmarkBusinessEngineBookmarkNoDescriptionTest() : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark();
+	
+		// Act
+		this._business.engineBookmark(b);
+	
+		// Assert
+		Assert.areEqual('', b.getDescription());
+	}
+
+	//endregion EngineBookmark
+
+	BookmarkBusinessAddAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark();
+		b.setTitle('> foo ').setURL('http://google.fr');
+		this._dao.setAddOutcome(b);
+
+		// Act
+		this._business.add(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.addTimes());
+				Assert.areEqual(b, this._dao.addArgs()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessAddBadURLAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark();
+		b.setTitle('> foo ').setURL('foo');
+		this._dao.setAddOutcome(b);
+
+		// Act
+		this._business.add(
+			b,
+			(outcome) => { obs.fail(); },
+			(error) => {
+				Assert.isNotNull(error);
+				Assert.areEqual(0, this._dao.addTimes());
+				
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessCreateFromURLAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		this._dao.setAddOutcome(new Bookmark());
+
+		// Act
+		this._business.createFromURL(
+			'http://google.fr',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.addTimes());
+				Assert.isNotNull(this._dao.addArgs()[0]);
+				Assert.areEqual('http://google.fr', this._dao.addArgs()[0].getURL());
+				Assert.areNotEqual('', this._dao.addArgs()[0].getTitle());
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessUpdateAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setURL('http://google.us').setTitle(' foo  ');
+
+		this._dao.setUpdateOutcome(b);
+
+		// Act
+		this._business.update(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.updateTimes());
+				Assert.areEqual(b, this._dao.updateArgs()[0]);
+				Assert.areEqual('http://google.us', b.getURL());
+				Assert.areEqual('foo', b.getTitle());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessUpdateBadURLAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setURL('  bar  ').setTitle(' foo  ');
+
+		// Act
+		this._business.update(
+			b,
+			(outcome) => {
+				obs.fail();
+			},
+			(error) => {
+				// Assert
+				Assert.isNotNull(error);
+				Assert.areEqual(0, this._dao.updateTimes());
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessDeleteAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setId('foo');
+		this._dao.setDeleteOutcome(true);
+
+		// Act
+		this._business.delete(
+			b,
+			() => {
+				// Assert
+				Assert.areEqual(1, this._dao.deleteTimes());
+				Assert.areEqual(b, this._dao.deleteArgs()[0]);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessFindAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setId('foo');
+		this._dao.setFindOutcome(b);
+
+		// Act
+		this._business.find(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.findTimes());
+				Assert.areEqual('foo', this._dao.findArgs()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkBusinessSortByViewsDescThenByTitleAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Bookmark>;
+
+		l = new ArrayList<Bookmark>();
+		l.add(new Bookmark().setId('foo'));
+		l.add(new Bookmark().setId('bar'));
+		this._dao.setSortByViewsDescThenByTitleAscOutcome(l);
+
+		// Act
+		this._business.sortByViewsDescThenByTitleAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.sortByViewsDescThenByTitleAscTimes());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/src/models/business/impl/TagBookmarkBusinessTest.ts b/testing/src/models/business/impl/TagBookmarkBusinessTest.ts
new file mode 100644
index 0000000..d78f8b4
--- /dev/null
+++ b/testing/src/models/business/impl/TagBookmarkBusinessTest.ts
@@ -0,0 +1,201 @@
+/// <reference path="../../../references.ts" />
+
+class TagBookmarkBusinessTest extends UnitTestClass {
+	private _tagDAO : Mocks.DAO.TagDAO;
+	private _bookmarkDAO : Mocks.DAO.BookmarkDAO;
+	private _tagBookmarkDAO : Mocks.DAO.TagBookmarkDAO;
+	private _tagBusiness : Mocks.Business.TagBusiness;
+	private _bookmarkBusiness : Mocks.Business.BookmarkBusiness;
+	private _args : TagBookmarkBusinessArgs;
+	private _business : TagBookmarkBusiness;
+
+	setUp() : void {
+		this._tagDAO = new Mocks.DAO.TagDAO();
+		this._bookmarkDAO = new Mocks.DAO.BookmarkDAO();
+		this._tagBookmarkDAO = new Mocks.DAO.TagBookmarkDAO();
+		this._tagBusiness = new Mocks.Business.TagBusiness();
+		this._bookmarkBusiness = new Mocks.Business.BookmarkBusiness();
+
+		this._args = new TagBookmarkBusinessArgs();
+		this._args
+			.setTagDAO(this._tagDAO)
+			.setBookmarkDAO(this._bookmarkDAO)
+			.setTagBookmarkDAO(this._tagBookmarkDAO)
+			.setTagBusiness(this._tagBusiness)
+			.setBookmarkBusiness(this._bookmarkBusiness);
+
+		this._business = new TagBookmarkBusiness(this._args);
+	}
+
+	tearDown() : void {
+		this._tagDAO = null;
+		this._bookmarkDAO = null;
+		this._tagBookmarkDAO = null;
+		this._tagBusiness = null;
+		this._bookmarkBusiness = null;
+		this._args = null;
+		this._business = null;
+	}
+
+	TagBookmarkBusinessConstructorTest() : void {
+		// Arrange
+		var args : TagBookmarkBusinessArgs;
+		var outcome : TagBookmarkBusiness;
+
+		args = new TagBookmarkBusinessArgs();
+	
+		// Act
+		outcome = new TagBookmarkBusiness(args);
+	
+		// Assert
+		Assert.isNotNull(outcome);
+	}
+
+	TagBookmarkBusinessSortTagsByLabelAscForBookmarkAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Tag>;
+		var b : Bookmark;
+
+		b = new Bookmark().setId('foobar');
+		l = new ArrayList<Tag>();
+		l.add(new Tag().setId('foo'));
+		l.add(new Tag().setId('bar'));
+
+		this._tagBookmarkDAO.setSortTagsByLabelAscForBookmarkOutcome(l);
+
+		// Act
+		this._business.sortTagsByLabelAscForBookmark(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._tagBookmarkDAO.sortTagsByLabelAscForBookmarkTimes());
+				Assert.areEqual(b, this._tagBookmarkDAO.sortTagsByLabelAscForBookmarkArgs()[0]);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkBusinessBindTagsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+		var tags : IList<Tag>;
+
+		b = new Bookmark().setId('foo');
+		tags = new ArrayList<Tag>();
+		tags.add(new Tag().setId('bar'));
+		tags.add(new Tag().setId('foobar'));
+
+		this._tagBookmarkDAO.setAddMultipleTagsRelationsOutcome(true);
+
+		// Act
+		this._business.bindTags(
+			b,
+			tags,
+			() => {
+				// Assert
+				Assert.areEqual(1, this._tagBookmarkDAO.addMultipleTagRelationsTimes());
+				Assert.areEqual(b, this._tagBookmarkDAO.addMultipleTagRelationsArgs()[0]);
+				Assert.areEqual(tags, this._tagBookmarkDAO.addMultipleTagRelationsArgs()[1]);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkBusinessUpdateTagBindingAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+		var tags : IList<Tag>;
+
+		b = new Bookmark().setId('foo');
+		tags = new ArrayList<Tag>();
+		tags.add(new Tag().setId('bar'));
+		tags.add(new Tag().setId('foobar'));
+
+		this._tagBookmarkDAO.setUpdateBookmarkRelationsOutcome(true);
+
+		// Act
+		this._business.updateTagBinding(
+			b,
+			tags,
+			() => {
+				// Assert
+				Assert.areEqual(1, this._tagBookmarkDAO.updateBookmarkRelationsTimes());
+				Assert.areEqual(b, this._tagBookmarkDAO.updateBookmarkRelationsArgs()[0]);
+				Assert.areEqual(tags, this._tagBookmarkDAO.updateBookmarkRelationsArgs()[1]);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkBusinessSortBookmarksByTitleAscForTagAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+		var l : IList<Bookmark>;
+
+		t = new Tag().setId('foo');
+		l = new ArrayList<Bookmark>();
+		l.add(new Bookmark().setId('bar'));
+		l.add(new Bookmark().setId('foobar'));
+
+		this._tagBookmarkDAO.setSortBookmarksByTitleAscForTagOutcome(l);
+
+		// Act
+		this._business.sortBookmarksByTitleAscForTag(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._tagBookmarkDAO.sortBookmarksByTitleAscForTagTimes());
+				Assert.areEqual(t, this._tagBookmarkDAO.sortBookmarksByTitleAscForTagArgs()[0]);
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkBusinessSearchAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var list : IList<Pair<Bookmark, IList<Tag>>>;
+		var t1 : Tag, t2 : Tag;
+		var b1 : Bookmark, b2 : Bookmark;
+		var tags1 : IList<Tag>, tags2 : IList<Tag>;
+
+		b1 = new Bookmark().setTitle('foo').setDescription('foobar');
+		b2 = new Bookmark().setTitle('bar').setURL('foo');
+		t1 = new Tag().setLabel('foobarbar');
+		t2 = new Tag().setLabel('barbar');
+
+		list = new ArrayList<Pair<Bookmark, IList<Tag>>>();
+		tags1 = new ArrayList<Tag>();
+		tags1.add(t1);
+		tags2 = new ArrayList<Tag>();
+		tags2.add(t2);
+		list.add(new Pair<Bookmark, IList<Tag>>(b1, tags1));
+		list.add(new Pair<Bookmark, IList<Tag>>(b2, tags2));
+
+		this._tagBookmarkDAO.setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(list);
+
+		// Act
+		this._business.search(
+			'foo hello',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._tagBookmarkDAO.sortBookmarksByTitleAscWithBoundTagsByLabelAscTimes());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+				Assert.areEqual('foo', outcome.getAt(0).getTitle());
+				Assert.areEqual(1, outcome.getAt(0).getScore());
+				Assert.areEqual('bar', outcome.getAt(1).getTitle());
+				Assert.areEqual(2 / 7, outcome.getAt(1).getScore());
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/src/models/business/impl/TagBusinessTest.ts b/testing/src/models/business/impl/TagBusinessTest.ts
new file mode 100644
index 0000000..d53bb00
--- /dev/null
+++ b/testing/src/models/business/impl/TagBusinessTest.ts
@@ -0,0 +1,309 @@
+/// <reference path="../../../references.ts" />
+
+class TagBusinessTest extends UnitTestClass {
+	private _dao : Mocks.DAO.TagDAO;
+	private _business : TagBusiness;
+
+	setUp() : void {
+		this._dao = new Mocks.DAO.TagDAO();
+		this._business = new TagBusiness(this._dao);
+	}
+
+	tearDown() : void {
+		this._dao = null;
+		this._business = null;
+	}
+
+	TagBusinessConstructorTest() : void {
+		// Arrange
+		var dao : ITagDAO;
+		var outcome : TagBusiness;
+
+		dao = new Mocks.DAO.TagDAO();
+	
+		// Act
+		outcome = new TagBusiness(dao);
+	
+		// Assert
+		Assert.isNotNull(outcome);
+	}
+
+	TagBusinessEngineTagTest() : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setId(' >> foo < ').setLabel('" bar   ');
+	
+		// Act
+		this._business.engineTag(t);
+	
+		// Assert
+		Assert.isNotNull(t);
+		Assert.areEqual('&gt;&gt; foo &lt;', t.getId());
+		Assert.areEqual('&quot; bar', t.getLabel());
+	}
+
+	//region isValueValid
+
+	TagBusinessIsValueValidTest() : void {
+		// Arrange
+		var value : string;
+		var isValid : boolean;
+		value = '  foo  ';
+	
+		// Act
+		isValid = this._business.isValueValid(value);
+	
+		// Assert
+		Assert.isTrue(isValid);
+	}
+
+	TagBusinessIsValueValidNullStringTest() : void {
+		// Arrange
+		var value : string;
+		var isValid : boolean;
+
+		value = undefined;
+	
+		// Act
+		isValid = this._business.isValueValid(value);
+	
+		// Assert
+		Assert.isFalse(isValid);
+	}
+
+	TagBusinessIsValueValidEmptyStringTest() : void {
+		// Arrange
+		var value : string;
+		var isValid : boolean;
+
+		value = '    ';
+	
+		// Act
+		isValid = this._business.isValueValid(value);
+	
+		// Assert
+		Assert.isFalse(isValid);
+	}
+
+	//endregion isValueValid
+
+	TagBusinessIsNotAlreadyExistingAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		this._dao.setFindByLabelOutcome(null);
+
+		// Act
+		this._business.isNotAlreadyExisting(
+			'  foo< ',
+			(success) => {
+				// Assert
+				Assert.areEqual(1, this._dao.findByLabelTimes());
+				Assert.areEqual('foo&lt;', this._dao.findByLabelArgs()[0]);
+				Assert.isTrue(success);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessAddAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setLabel('  > foo ');
+		this._dao.setAddOutcome(t);
+
+		// Act
+		this._business.add(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.addTimes());
+				Assert.areEqual(t, this._dao.addArgs()[0]);
+				Assert.areEqual('&gt; foo', t.getLabel());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(t, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessAddBadLabelAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setLabel('  ');
+		this._dao.setAddOutcome(t);
+
+		// Act
+		this._business.add(
+			t,
+			(outcome) => {
+				obs.fail();
+			},
+			(error) => {
+				// Assert
+				Assert.areEqual(0, this._dao.addTimes());
+				Assert.isNotNull(error);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessAddListAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Tag>;
+
+		l = new ArrayList<Tag>();
+		l.add(new Tag().setLabel(' foo'));
+		l.add(new Tag().setLabel('bar  '));
+		l.add(new Tag().setLabel('> foobar  '));
+
+		this._dao.setAddOutcome(new Tag());
+
+		// Act
+		this._business.addList(
+			l,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(3, this._dao.addTimes());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(3, outcome.getLength());
+				Assert.areEqual('foo', l.getAt(0).getLabel());
+				Assert.areEqual('bar', l.getAt(1).getLabel());
+				Assert.areEqual('&gt; foobar', l.getAt(2).getLabel());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessUpdateAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag();
+		t.setId(' > foo').setLabel('  bar  ');
+		this._dao.setUpdateOutcome(t);
+
+		// Act
+		this._business.update(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.updateTimes());
+				Assert.areEqual(t, this._dao.updateArgs()[0]);
+				Assert.areEqual('&gt; foo', t.getId());
+				Assert.areEqual('bar', t.getLabel());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(t, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessUpdateNullTagAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+
+		// Act
+		this._business.update(
+			undefined,
+			(outcome) => {
+				obs.fail();
+			},
+			(error) => {
+				// Assert
+				Assert.areEqual(0, this._dao.updateTimes());
+				Assert.isNotNull(error);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessDeleteAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setId('foo');
+		this._dao.setDeleteOutcome(true);
+
+		// Act
+		this._business.delete(
+			t,
+			() => {
+				// Assert
+				Assert.areEqual(1, this._dao.deleteTimes());
+				Assert.areEqual(t, this._dao.deleteArgs()[0]);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessMergeAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t1 : Tag, t2 : Tag, t3 : Tag;
+		var input : IList<any>, existing : IList<any>;
+
+		t1 = new Tag().setId('foo').setLabel('Al Pacino');
+		t2 = new Tag().setId('bar').setLabel('Keanu Reeves');
+		t3 = new Tag().setId('foobar').setLabel('Robert De Niro');
+
+		input = new ArrayList<Tag>();
+		input.add(t1);
+		input.add(t2);
+		input.add(t3);
+		existing = new ArrayList<Tag>();
+		existing.add(t1);
+		existing.add(t2);
+
+		this._dao.setGetOutcome(existing);
+		this._dao.setAddOutcome(t3);
+
+		// Act
+		this._business.merge(
+			input,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.getTimes());
+				Assert.areEqual(1, this._dao.addTimes());
+				Assert.areEqual(t3, this._dao.addArgs()[0]);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(3, outcome.getLength());
+				Assert.isNotNull(outcome.findFirst(e => e.getId() === 'foo'));
+				Assert.isNotNull(outcome.findFirst(e => e.getId() === 'bar'));
+				Assert.isNotNull(outcome.findFirst(e => e.getId() === 'foobar'));
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBusinessSortByLabelAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Tag>;
+
+		l = new ArrayList<Tag>();
+		l.add(new Tag().setId('foo'));
+		l.add(new Tag().setId('bar'));
+
+		this._dao.setSortByLabelAscOutcome(l);
+
+		// Act
+		this._business.sortByLabelAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._dao.sortByLabelAscTimes());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/models/business/utils/ScoredBookmarkTest.ts b/testing/src/models/business/utils/ScoredBookmarkTest.ts
similarity index 74%
rename from testing/models/business/utils/ScoredBookmarkTest.ts
rename to testing/src/models/business/utils/ScoredBookmarkTest.ts
index 32be7e2..9bd7b37 100644
--- a/testing/models/business/utils/ScoredBookmarkTest.ts
+++ b/testing/src/models/business/utils/ScoredBookmarkTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../test_dependencies.ts" />
+/// <reference path="../../../references.ts" />
 
 class ScoredBookmarkTest extends UnitTestClass {
 	private _bookmark : ScoredBookmark;
@@ -22,8 +22,6 @@ class ScoredBookmarkTest extends UnitTestClass {
 		outcome = this._bookmark.getScore();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 }
-
-UnitTestClass.handle(new ScoredBookmarkTest());
diff --git a/testing/models/business/utils/TagBookmarkBusinessArgsTest.ts b/testing/src/models/business/utils/TagBookmarkBusinessArgsTest.ts
similarity index 84%
rename from testing/models/business/utils/TagBookmarkBusinessArgsTest.ts
rename to testing/src/models/business/utils/TagBookmarkBusinessArgsTest.ts
index 8318ccf..f48dc0c 100644
--- a/testing/models/business/utils/TagBookmarkBusinessArgsTest.ts
+++ b/testing/src/models/business/utils/TagBookmarkBusinessArgsTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../test_dependencies.ts" />
+/// <reference path="../../../references.ts" />
 
 class TagBookmarkBusinessArgsTest extends UnitTestClass {
 	private _args : TagBookmarkBusinessArgs;
@@ -22,7 +22,7 @@ class TagBookmarkBusinessArgsTest extends UnitTestClass {
 		outcome = this._args.getTagDAO();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 
 	TagBookmarkBusinessArgsBookmarkDAOTest() : void {
@@ -36,7 +36,7 @@ class TagBookmarkBusinessArgsTest extends UnitTestClass {
 		outcome = this._args.getBookmarkDAO();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 
 	TagBookmarkBusinessArgsTagBookmarkDAOTest() : void {
@@ -50,7 +50,7 @@ class TagBookmarkBusinessArgsTest extends UnitTestClass {
 		outcome = this._args.getTagBookmarkDAO();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 
 	TagBookmarkBusinessArgsTagBusinessTest() : void {
@@ -64,7 +64,7 @@ class TagBookmarkBusinessArgsTest extends UnitTestClass {
 		outcome = this._args.getTagBusiness();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 
 	TagBookmarkBusinessArgsBookmarkBusinessTest() : void {
@@ -78,8 +78,6 @@ class TagBookmarkBusinessArgsTest extends UnitTestClass {
 		outcome = this._args.getBookmarkBusiness();
 	
 		// Assert
-		this.areIdentical(value, outcome);
+		Assert.areEqual(value, outcome);
 	}
 }
-
-UnitTestClass.handle(new TagBookmarkBusinessArgsTest());
diff --git a/testing/src/models/dao/impl/BookmarkDAOTest.ts b/testing/src/models/dao/impl/BookmarkDAOTest.ts
new file mode 100644
index 0000000..7a3dc04
--- /dev/null
+++ b/testing/src/models/dao/impl/BookmarkDAOTest.ts
@@ -0,0 +1,326 @@
+/// <reference path="../../../references.ts" />
+
+class BookmarkDAOTest extends UnitTestClass {
+	private _tagBkDAO : Mocks.DAO.TagBookmarkDAO;
+	private _aro : Mocks.DAO.ActiveRecordObject;
+	private _dao : BookmarkDAO;
+
+	setUp() : void {
+		this._aro = new Mocks.DAO.ActiveRecordObject();
+		this._tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
+		this._dao = new BookmarkDAO(this._aro, this._tagBkDAO);
+	}
+
+	tearDown() : void {
+		this._aro = null;
+		this._tagBkDAO = null;
+		this._dao = null;
+	}
+
+	BookmarkDAOConstructorTest() : void {
+		// Arrange
+		var tagBKDAO : ITagBookmarkDAO;
+		var aro : IActiveRecordObject;
+		var outcome : BookmarkDAO;
+
+		tagBKDAO = new Mocks.DAO.TagBookmarkDAO();
+		aro = new Mocks.DAO.ActiveRecordObject();
+	
+		// Act
+		outcome = new BookmarkDAO(aro, tagBKDAO);
+	
+		// Assert
+		Assert.isNotNull(outcome);
+		Assert.areEqual(aro, outcome.getARO());
+	}
+
+	BookmarkDAOAddAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b =
+			new Bookmark()
+			.setId('useless')
+			.setTitle('foo')
+			.setURL('google.fr')
+			.setDescription('Amazing')
+			.setViews(60000);
+
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.add(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.insertTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.insertArgs()[0]);
+
+				Assert.areEqual(5, this._aro.insertArgs()[1].getLength());
+				Assert.areNotEqual('useless', this._aro.insertArgs()[1].getAt(0));
+				Assert.areEqual('google.fr', this._aro.insertArgs()[1].getAt(1));
+				Assert.areEqual('foo', this._aro.insertArgs()[1].getAt(2));
+				Assert.areEqual('Amazing', this._aro.insertArgs()[1].getAt(3));
+				Assert.areEqual(0, this._aro.insertArgs()[1].getAt(4));
+
+				Assert.isNotNull(outcome);
+				Assert.areNotEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOAddRawAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b =
+			new Bookmark()
+			.setId('10')
+			.setTitle('foo')
+			.setURL('google.fr')
+			.setDescription('Amazing')
+			.setViews(60000);
+
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.addRaw(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.insertTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.insertArgs()[0]);
+
+				Assert.areEqual(5, this._aro.insertArgs()[1].getLength());
+				Assert.areEqual('10', this._aro.insertArgs()[1].getAt(0));
+				Assert.areEqual('google.fr', this._aro.insertArgs()[1].getAt(1));
+				Assert.areEqual('foo', this._aro.insertArgs()[1].getAt(2));
+				Assert.areEqual('Amazing', this._aro.insertArgs()[1].getAt(3));
+				Assert.areEqual(60000, this._aro.insertArgs()[1].getAt(4));
+
+				Assert.isTrue(outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOUpdateAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b =
+			new Bookmark()
+			.setId('bar')
+			.setTitle('foo')
+			.setURL('google.fr')
+			.setDescription('Amazing')
+			.setViews(500);
+
+		this._aro.setUpdateOutcome(true);
+
+		// Act
+		this._dao.update(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.updateTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.updateArgs()[0]);
+
+				Assert.areEqual('id', this._aro.updateArgs()[1].getFirst());
+				Assert.areEqual('bar', this._aro.updateArgs()[1].getSecond());
+
+				Assert.areEqual(4, this._aro.updateArgs()[2].getLength());
+				Assert.areEqual('google.fr', this._aro.updateArgs()[2].get('url'));
+				Assert.areEqual('foo', this._aro.updateArgs()[2].get('title'));
+				Assert.areEqual('Amazing', this._aro.updateArgs()[2].get('description'));
+				Assert.areEqual(500, this._aro.updateArgs()[2].get('views'));
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAODeleteAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setId('foo');
+
+		this._tagBkDAO.setRemoveBookmarkRelationsOutcome(true);
+		this._aro.setDeleteOutcome(true);
+
+		// Act
+		this._dao.delete(
+			b,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._tagBkDAO.removeBookmarkRelationsTimes());
+				Assert.areEqual(b, this._tagBkDAO.removeBookmarkRelationsArgs()[0]);
+
+				Assert.areEqual(1, this._aro.deleteTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.deleteArgs()[0]);
+				Assert.areEqual('id', this._aro.deleteArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond());
+
+				Assert.isTrue(outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOGetAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Bookmark>;
+
+		l = new ArrayList<Bookmark>();
+		l.add(new Bookmark().setId('foo'));
+		l.add(new Bookmark().setId('bar'));
+		this._aro.setGetOutcome(l);
+
+		// Act
+		this._dao.get(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.getTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.getArgs()[0]);
+				Assert.areEqual(Bookmark.fromObject, this._aro.getArgs()[2]);
+
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOFindAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b : Bookmark;
+
+		b = new Bookmark().setId('foo');
+		this._aro.setFindOutcome(b);
+
+		// Act
+		this._dao.find(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.findTimes());
+				Assert.areEqual(DAOTables.Bookmarks, this._aro.findArgs()[0]);
+				Assert.areEqual('id', this._aro.findArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.findArgs()[1].getSecond());
+				Assert.areEqual(Bookmark.fromObject, this._aro.findArgs()[3]);
+
+				Assert.areEqual(b, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOSortByViewsDescThenByTitleAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b1 : any, b2 : any;
+
+		b1 = {
+			id : '345',
+			title : 'foo',
+			url : 'google.es',
+			description : 'Marvelous',
+			views : 56
+		};
+		b2 = {
+			id : '675',
+			title : 'bar',
+			url : 'google.de',
+			description : 'Fantastic',
+			views : 43
+		};
+		this._aro.setExecuteSQLOutcome([b1, b2]);
+
+		// Act
+		this._dao.sortByViewsDescThenByTitleAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(
+					'SELECT * FROM ' + DAOTables.Bookmarks + ' ORDER BY views DESC, LOWER(title) ASC',
+					this._aro.executeSQLArgs()[0]
+				);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+
+				Assert.areEqual('345', outcome.getAt(0).getId());
+				Assert.areEqual('foo', outcome.getAt(0).getTitle());
+				Assert.areEqual('google.es', outcome.getAt(0).getURL());
+				Assert.areEqual('Marvelous', outcome.getAt(0).getDescription());
+				Assert.areEqual(56, outcome.getAt(0).getViews());
+
+				Assert.areEqual('675', outcome.getAt(1).getId());
+				Assert.areEqual('bar', outcome.getAt(1).getTitle());
+				Assert.areEqual('google.de', outcome.getAt(1).getURL());
+				Assert.areEqual('Fantastic', outcome.getAt(1).getDescription());
+				Assert.areEqual(43, outcome.getAt(1).getViews());
+
+				obs.success();
+			}
+		);
+	}
+
+	BookmarkDAOSortByTitleAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var b1 : any, b2 : any;
+
+		b1 = {
+			id : '345',
+			title : 'foo',
+			url : 'google.es',
+			description : 'Marvelous',
+			views : 56
+		};
+		b2 = {
+			id : '675',
+			title : 'bar',
+			url : 'google.de',
+			description : 'Fantastic',
+			views : 43
+		};
+		this._aro.setExecuteSQLOutcome([b1, b2]);
+
+		// Act
+		this._dao.sortByTitleAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(
+					'SELECT * FROM ' + DAOTables.Bookmarks + ' ORDER BY LOWER(title) ASC',
+					this._aro.executeSQLArgs()[0]
+				);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+
+				Assert.areEqual('345', outcome.getAt(0).getId());
+				Assert.areEqual('foo', outcome.getAt(0).getTitle());
+				Assert.areEqual('google.es', outcome.getAt(0).getURL());
+				Assert.areEqual('Marvelous', outcome.getAt(0).getDescription());
+				Assert.areEqual(56, outcome.getAt(0).getViews());
+
+				Assert.areEqual('675', outcome.getAt(1).getId());
+				Assert.areEqual('bar', outcome.getAt(1).getTitle());
+				Assert.areEqual('google.de', outcome.getAt(1).getURL());
+				Assert.areEqual('Fantastic', outcome.getAt(1).getDescription());
+				Assert.areEqual(43, outcome.getAt(1).getViews());
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/src/models/dao/impl/TagBookmarkDAOTest.ts b/testing/src/models/dao/impl/TagBookmarkDAOTest.ts
new file mode 100644
index 0000000..0205c3c
--- /dev/null
+++ b/testing/src/models/dao/impl/TagBookmarkDAOTest.ts
@@ -0,0 +1,401 @@
+/// <reference path="../../../references.ts" />
+
+class TagBookmarkDAOTest extends UnitTestClass {
+	private _aro : Mocks.DAO.ActiveRecordObject;
+	private _dao : TagBookmarkDAO;
+
+	setUp() : void {
+		this._aro = new Mocks.DAO.ActiveRecordObject();
+		this._dao = new TagBookmarkDAO(this._aro);
+	}
+
+	tearDown() : void {
+		this._aro = null;
+		this._dao = null;
+	}
+
+	TagBookmarkDAOConstructorTest() : void {
+		// Arrange
+		var aro : IActiveRecordObject;
+		var dao : TagBookmarkDAO;
+
+		aro = new Mocks.DAO.ActiveRecordObject();
+	
+		// Act
+		dao = new TagBookmarkDAO(aro);
+	
+		// Assert
+		Assert.isNotNull(dao);
+		Assert.areEqual(aro, dao.getARO());
+	}
+
+	TagBookmarkAddRelationAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var tag : Tag;
+		var bk : Bookmark;
+
+		this._aro.setInsertOutcome(true);
+
+		tag = new Tag();
+		tag.setId('foo');
+		bk = new Bookmark();
+		bk.setId('bar');
+	
+		// Act
+		this._dao.addRelation(
+			tag,
+			bk,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+				Assert.areEqual(1, this._aro.insertTimes());
+				Assert.areEqual(DAOTables.TagBookmark, this._aro.insertArgs()[0]);
+				Assert.areEqual('foo', this._aro.insertArgs()[1].getAt(0));
+				Assert.areEqual('bar', this._aro.insertArgs()[1].getAt(1));
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOAddMultipleRelationsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var bk : Bookmark;
+		var tags : IList<Tag>;
+		var t1 : Tag, t2 : Tag;
+
+		bk = new Bookmark();
+		bk.setId('foo');
+
+		t1 = new Tag();
+		t1.setId('bar');
+		t2 = new Tag();
+		t2.setId('foobar');
+		tags = new ArrayList<Tag>();
+		tags.add(t1);
+		tags.add(t2);
+
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.addMultipleTagRelations(
+			bk,
+			tags,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+				Assert.areEqual(2, this._aro.insertTimes());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOUpdateBookmarkRelationsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var bk : Bookmark;
+		var t1 : Tag, t2 : Tag;
+		var tags : IList<Tag>;
+
+		bk = new Bookmark();
+		bk.setId('foo');
+
+		t1 = new Tag();
+		t1.setId('bar');
+		t2 = new Tag();
+		t2.setId('foobar');
+		tags = new ArrayList<Tag>();
+		tags.add(t1);
+		tags.add(t2);
+
+		this._aro.setDeleteOutcome(true);
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.updateBookmarkRelations(
+			bk,
+			tags,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+
+				// Check delete request
+				Assert.areEqual(1, this._aro.deleteTimes());
+				Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
+				Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond());
+
+				// Check insert requests
+				Assert.areEqual(2, this._aro.insertTimes());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAORemoveBookmarkRelationsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var bk : Bookmark;
+
+		bk = new Bookmark();
+		bk.setId('foo');
+
+		this._aro.setDeleteOutcome(true);
+
+		// Act
+		this._dao.removeBookmarkRelations(
+			bk,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+
+				// Check delete request
+				Assert.areEqual(1, this._aro.deleteTimes());
+				Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
+				Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAORemoveTagRelationsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var tag : Tag;
+
+		tag = new Tag();
+		tag.setId('foo');
+
+		this._aro.setDeleteOutcome(true);
+
+		// Act
+		this._dao.removeTagRelations(
+			tag,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+
+				// Check delete request
+				Assert.areEqual(1, this._aro.deleteTimes());
+				Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]);
+				Assert.areEqual('tag_id', this._aro.deleteArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOGetRawRelationsAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var data : IList<any>;
+
+		data = new ArrayList<any>();
+		data.add({ bookmark_id: 'foo', tag_id: 'bar'});
+		this._aro.setGetOutcome(data);
+
+		// Act
+		this._dao.getRaw(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.getTimes());
+				Assert.areEqual(DAOTables.TagBookmark, this._aro.getArgs()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(1, outcome.getLength());
+				Assert.areEqual('foo', outcome.getAt(0).bookmark_id);
+				Assert.areEqual('bar', outcome.getAt(0).tag_id);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOSortTagsByLabelAscForBookmarkAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var bk : Bookmark;
+		var t1 : any, t2 : any;
+		var request : StringBuffer;
+
+		bk = new Bookmark();
+		bk.setId('foo');
+
+		request = new StringBuffer('SELECT * FROM ' + DAOTables.Tags + ' WHERE id IN (');
+		request.append('SELECT tag_id FROM ' + DAOTables.TagBookmark + ' WHERE ');
+		request.append('bookmark_id = "foo") ORDER BY LOWER(label) ASC');
+
+		t1 = {
+			id: 'bar',
+			label: 'foobar'
+		};
+		t2 = {
+			id: 'barbar',
+			label: 'foobarbar'
+		};
+		this._aro.setExecuteSQLOutcome([t1, t2]);
+
+		// Act
+		this._dao.sortTagsByLabelAscForBookmark(
+			bk,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(request.toString(), this._aro.executeSQLArgs()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+				Assert.areEqual('bar', outcome.getAt(0).getId());
+				Assert.areEqual('foobar', outcome.getAt(0).getLabel());
+				Assert.areEqual('barbar', outcome.getAt(1).getId());
+				Assert.areEqual('foobarbar', outcome.getAt(1).getLabel());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOSortBookmarksByTitleAcForTagAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+		var b1 : any, b2 : any;
+		var request : StringBuffer;
+
+		t = new Tag();
+		t.setId('foo');
+
+		request = new StringBuffer('SELECT * FROM ' + DAOTables.Bookmarks + ' WHERE id IN (');
+		request.append('SELECT bookmark_id FROM ' + DAOTables.TagBookmark + ' WHERE ');
+		request.append('tag_id = "foo") ORDER BY LOWER(title) ASC');
+
+		b1 = {
+			id : '1',
+			url : 'google.uk',
+			title : 'foo',
+			description : 'Wonderful',
+			views : 45
+		};
+		b2 = {
+			id : '2',
+			url : 'google.fr',
+			title : 'bar',
+			description : 'Marvelous',
+			views : 89
+		};
+		this._aro.setExecuteSQLOutcome([b1, b2]);
+
+		// Act
+		this._dao.sortBookmarksByTitleAscForTag(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(request.toString(), this._aro.executeSQLArgs()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+
+				Assert.areEqual('1', outcome.getAt(0).getId());
+				Assert.areEqual('google.uk', outcome.getAt(0).getURL());
+				Assert.areEqual('foo', outcome.getAt(0).getTitle());
+				Assert.areEqual('Wonderful', outcome.getAt(0).getDescription());
+				Assert.areEqual(45, outcome.getAt(0).getViews());
+
+				Assert.areEqual('2', outcome.getAt(1).getId());
+				Assert.areEqual('google.fr', outcome.getAt(1).getURL());
+				Assert.areEqual('bar', outcome.getAt(1).getTitle());
+				Assert.areEqual('Marvelous', outcome.getAt(1).getDescription());
+				Assert.areEqual(89, outcome.getAt(1).getViews());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagBookmarkDAOSortBookmarksByTitleAscWithBoundTagsByLabelAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var o1 : any, o2 : any, o3 : any, o4 : any;
+		var request : StringBuffer;
+
+		request = new StringBuffer('SELECT bk.id AS id, bk.url as url, bk.title AS title, bk.description AS description, ');
+		request
+			.append('bk.views AS views, outcome.tagId AS tagId, outcome.tagLabel AS tagLabel ')
+			.append('FROM ' + DAOTables.Bookmarks + ' AS bk ')
+			.append('LEFT JOIN (')
+			.append('SELECT t.id AS tagId, t.label AS tagLabel, tbk.bookmark_id AS bkId FROM ')
+			.append(DAOTables.Tags + ' AS t INNER JOIN ')
+			.append(DAOTables.TagBookmark + ' AS tbk ON ')
+			.append('t.id = tbk.tag_id) AS outcome ')
+			.append('ON bk.id = outcome.bkId ')
+			.append('ORDER BY LOWER(bk.title) ASC, LOWER(outcome.tagLabel) ASC');
+
+		o1 = {
+			id : '1',
+			title : 'foo',
+			url : 'google.fr',
+			description : 'Amazing!',
+			views : 56,
+			tagId : '34',
+			tagLabel : 'bar'
+		};
+		o2 = {
+			id : '1',
+			title : 'foo',
+			url : 'google.fr',
+			description : 'Amazing!',
+			views : 56,
+			tagId : '45',
+			tagLabel : 'barbar'
+		};
+		o3 = {
+			id : '2',
+			title : 'foobar',
+			url : 'google.uk',
+			description : 'Formidable!',
+			views : 789
+		};
+		o4 = {
+			id : '2',
+			title : 'foobar',
+			url : 'google.uk',
+			description : 'Formidable!',
+			views : 789,
+			tagId : '35',
+			tagLabel : 'foobarbar'
+		};
+		this._aro.setExecuteSQLOutcome([o1, o2, o3, o4]);
+
+		// Act
+		this._dao.sortBookmarksByTitleAscWithBoundTagsByLabelAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(request.toString(), this._aro.executeSQLArgs()[0]);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+
+				Assert.areEqual('1', outcome.getAt(0).getFirst().getId());
+				Assert.areEqual('foo', outcome.getAt(0).getFirst().getTitle());
+				Assert.areEqual('google.fr', outcome.getAt(0).getFirst().getURL());
+				Assert.areEqual('Amazing!', outcome.getAt(0).getFirst().getDescription());
+				Assert.areEqual(56, outcome.getAt(0).getFirst().getViews());
+
+				Assert.areEqual(2, outcome.getAt(0).getSecond().getLength());
+				Assert.areEqual('34', outcome.getAt(0).getSecond().getAt(0).getId());
+				Assert.areEqual('bar', outcome.getAt(0).getSecond().getAt(0).getLabel());
+				Assert.areEqual('45', outcome.getAt(0).getSecond().getAt(1).getId());
+				Assert.areEqual('barbar', outcome.getAt(0).getSecond().getAt(1).getLabel());
+
+				Assert.areEqual('2', outcome.getAt(1).getFirst().getId());
+				Assert.areEqual('foobar', outcome.getAt(1).getFirst().getTitle());
+				Assert.areEqual('google.uk', outcome.getAt(1).getFirst().getURL());
+				Assert.areEqual('Formidable!', outcome.getAt(1).getFirst().getDescription());
+				Assert.areEqual(789, outcome.getAt(1).getFirst().getViews());
+
+				Assert.areEqual(1, outcome.getAt(1).getSecond().getLength());
+				Assert.areEqual('35', outcome.getAt(1).getSecond().getAt(0).getId());
+				Assert.areEqual('foobarbar', outcome.getAt(1).getSecond().getAt(0).getLabel());
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/src/models/dao/impl/TagDAOTest.ts b/testing/src/models/dao/impl/TagDAOTest.ts
new file mode 100644
index 0000000..1d736e4
--- /dev/null
+++ b/testing/src/models/dao/impl/TagDAOTest.ts
@@ -0,0 +1,259 @@
+/// <reference path="../../../references.ts" />
+
+class TagDAOTest extends UnitTestClass {
+
+	private _tagBkDAO : Mocks.DAO.TagBookmarkDAO;
+	private _aro : Mocks.DAO.ActiveRecordObject;
+	private _dao : TagDAO;
+
+	setUp() : void {
+		this._tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
+		this._aro = new Mocks.DAO.ActiveRecordObject();
+		this._dao = new TagDAO(this._aro, this._tagBkDAO);
+	}
+
+	tearDown() : void {
+		this._tagBkDAO = null;
+		this._aro = null;
+		this._dao = null;
+	}
+
+	TagDAOConstructorTest() : void {
+		// Arrange
+		var tagBkDAO : ITagBookmarkDAO;
+		var aro : IActiveRecordObject;
+		var outcome : TagDAO;
+
+		tagBkDAO = new Mocks.DAO.TagBookmarkDAO();
+		aro = new Mocks.DAO.ActiveRecordObject();
+	
+		// Act
+		outcome = new TagDAO(aro, tagBkDAO);
+	
+		// Assert
+		Assert.isNotNull(outcome);
+		Assert.areEqual(aro, outcome.getARO());
+	}
+
+	TagDAOAddAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag();
+		t.setId('useless');
+		t.setLabel('foo');
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.add(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.insertTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.insertArgs()[0]);
+				Assert.areEqual(2, this._aro.insertArgs()[1].getLength());
+				Assert.areNotEqual('useless', this._aro.insertArgs()[1].getAt(0));
+				Assert.areEqual('foo', this._aro.insertArgs()[1].getAt(1));
+
+				Assert.isNotNull(outcome);
+				Assert.areNotEqual('useless', outcome.getId());
+				Assert.areEqual('foo', outcome.getLabel());
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOAddRawAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag();
+		t.setId('bar');
+		t.setLabel('foo');
+		this._aro.setInsertOutcome(true);
+
+		// Act
+		this._dao.addRaw(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.insertTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.insertArgs()[0]);
+				Assert.areEqual(2, this._aro.insertArgs()[1].getLength());
+				Assert.areEqual('bar', this._aro.insertArgs()[1].getAt(0));
+				Assert.areEqual('foo', this._aro.insertArgs()[1].getAt(1));
+
+				Assert.isTrue(outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOUpdateAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag();
+		t.setId('foo').setLabel('bar');
+
+		this._aro.setUpdateOutcome(true);
+
+		// Act
+		this._dao.update(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.updateTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.updateArgs()[0]);
+
+				Assert.areEqual('id', this._aro.updateArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.updateArgs()[1].getSecond());
+
+				Assert.areEqual(1, this._aro.updateArgs()[2].getLength());
+				Assert.areEqual('bar', this._aro.updateArgs()[2].get('label'));
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(t, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAODeleteAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setId('foo');
+		this._tagBkDAO.setRemoveTagRelationsOutcome(true);
+		this._aro.setDeleteOutcome(true);
+
+		// Act
+		this._dao.delete(
+			t,
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._tagBkDAO.removeTagRelationsTimes());
+				Assert.areEqual(t, this._tagBkDAO.removeTagRelationsArgs()[0]);
+
+				Assert.areEqual(1, this._aro.deleteTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.deleteArgs()[0]);
+				Assert.areEqual('id', this._aro.deleteArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond());
+
+				Assert.isTrue(outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOGetAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var l : IList<Tag>;
+
+		l = new ArrayList<Tag>();
+		l.add(new Tag().setId('foo'));
+		l.add(new Tag().setId('bar'));
+		this._aro.setGetOutcome(l);
+
+		// Act
+		this._dao.get(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.getTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.getArgs()[0]);
+				Assert.areEqual(Tag.fromObject, this._aro.getArgs()[2]);
+				Assert.areEqual(l, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOFindAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setId('foo');
+		this._aro.setFindOutcome(t);
+
+		// Act
+		this._dao.find(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.findTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.findArgs()[0]);
+				Assert.areEqual('id', this._aro.findArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.findArgs()[1].getSecond());
+				Assert.areEqual(Tag.fromObject, this._aro.findArgs()[3]);
+				Assert.areEqual(t, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOFindByLabelAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t : Tag;
+
+		t = new Tag().setLabel('foo');
+		this._aro.setFindOutcome(t);
+
+		// Act
+		this._dao.findByLabel(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.findTimes());
+				Assert.areEqual(DAOTables.Tags, this._aro.findArgs()[0]);
+				Assert.areEqual('label', this._aro.findArgs()[1].getFirst());
+				Assert.areEqual('foo', this._aro.findArgs()[1].getSecond());
+				Assert.areEqual(Tag.fromObject, this._aro.findArgs()[3]);
+				Assert.areEqual(t, outcome);
+
+				obs.success();
+			}
+		);
+	}
+
+	TagDAOSortByLabelAscAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var t1 : any, t2 : any;
+
+		t1 = {
+			id : 'foo',
+			label : 'bar'
+		};
+		t2 = {
+			id : 'barbar',
+			label : 'foobar'
+		};
+		this._aro.setExecuteSQLOutcome([t1, t2]);
+
+		// Act
+		this._dao.sortByLabelAsc(
+			(outcome) => {
+				// Assert
+				Assert.areEqual(1, this._aro.executeSQLTimes());
+				Assert.areEqual(
+					'SELECT * FROM ' + DAOTables.Tags + ' ORDER BY LOWER(label) ASC',
+					this._aro.executeSQLArgs()[0]
+				);
+
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+				Assert.areEqual('foo', outcome.getAt(0).getId());
+				Assert.areEqual('bar', outcome.getAt(0).getLabel());
+				Assert.areEqual('barbar', outcome.getAt(1).getId());
+				Assert.areEqual('foobar', outcome.getAt(1).getLabel());
+
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/models/dao/utils/DataAccessObjectTest.ts b/testing/src/models/dao/utils/DataAccessObjectTest.ts
similarity index 72%
rename from testing/models/dao/utils/DataAccessObjectTest.ts
rename to testing/src/models/dao/utils/DataAccessObjectTest.ts
index 4a52b78..b5a23a5 100644
--- a/testing/models/dao/utils/DataAccessObjectTest.ts
+++ b/testing/src/models/dao/utils/DataAccessObjectTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../test_dependencies.ts" />
+/// <reference path="../../../references.ts" />
 
 class DataAccessObjectTest extends UnitTestClass {
 
@@ -13,8 +13,8 @@ class DataAccessObjectTest extends UnitTestClass {
 		dao = new DataAccessObject(aro);
 	
 		// Assert
-		this.isTrue(TSObject.exists(dao));
-		this.areIdentical(aro, dao.getARO());
+		Assert.isNotNull(dao);
+		Assert.areEqual(aro, dao.getARO());
 	}
 
 	DataAccessObjectGetAROTest() : void {
@@ -29,8 +29,6 @@ class DataAccessObjectTest extends UnitTestClass {
 		outcome = dao.getARO();
 	
 		// Assert
-		this.areIdentical(aro, outcome);
+		Assert.areEqual(aro, outcome);
 	}
 }
-
-UnitTestClass.handle(new DataAccessObjectTest());
diff --git a/testing/models/utils/AROFactoryTest.ts b/testing/src/models/utils/AROFactoryTest.ts
similarity index 71%
rename from testing/models/utils/AROFactoryTest.ts
rename to testing/src/models/utils/AROFactoryTest.ts
index 7008e36..3ea5f39 100644
--- a/testing/models/utils/AROFactoryTest.ts
+++ b/testing/src/models/utils/AROFactoryTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../test_dependencies.ts" />
+/// <reference path="../../references.ts" />
 
 class AROFactoryTest extends UnitTestClass {
 	private _config : ActiveRecordConfig;
@@ -23,7 +23,7 @@ class AROFactoryTest extends UnitTestClass {
 		outcome = AROFactory.build(this._config);
 	
 		// Assert
-		this.isTrue(TSObject.exists(outcome));
+		Assert.isNotNull(outcome);
 	}
 
 	AROFactoryBuildTwiceTest() : void {
@@ -35,10 +35,8 @@ class AROFactoryTest extends UnitTestClass {
 		out2 = AROFactory.build(this._config);
 	
 		// Assert
-		this.isTrue(TSObject.exists(out1));
-		this.isTrue(TSObject.exists(out2));
-		this.areIdentical(out1, out2);
+		Assert.isNotNull(out1);
+		Assert.isNotNull(out2);
+		Assert.areEqual(out1, out2);
 	}
 }
-
-UnitTestClass.handle(new AROFactoryTest());
diff --git a/testing/test_dependencies.ts b/testing/src/references.ts
similarity index 92%
rename from testing/test_dependencies.ts
rename to testing/src/references.ts
index 4962c12..a26739c 100644
--- a/testing/test_dependencies.ts
+++ b/testing/src/references.ts
@@ -1,8 +1,6 @@
-/// <reference path="libs/tsUnit.ts" />
-/// <reference path="app_dependencies.ts" />
-/// <reference path="UnitTestClass.ts" />
+/// <reference path="libs/oscar.1.0.2.min.ts" />
 
-/// <reference path="mocks/DAO.ts" />
+/// <reference path="../../app/dependencies.ts" />
 
 //grunt-start
 /// <reference path="helpers/SecurityHelperTest.ts" />
@@ -10,6 +8,7 @@
 /// <reference path="helpers/URLHelperTest.ts" />
 /// <reference path="mocks/ARO.ts" />
 /// <reference path="mocks/Business.ts" />
+/// <reference path="mocks/DAO.ts" />
 /// <reference path="mocks/Utils.ts" />
 /// <reference path="models/beans/BookmarkTest.ts" />
 /// <reference path="models/beans/TagTest.ts" />
diff --git a/testing/system/GuidTest.ts b/testing/src/system/GuidTest.ts
similarity index 78%
rename from testing/system/GuidTest.ts
rename to testing/src/system/GuidTest.ts
index 15af337..2fccd85 100644
--- a/testing/system/GuidTest.ts
+++ b/testing/src/system/GuidTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../test_dependencies.ts" />
+/// <reference path="../references.ts" />
 
 class GuidTest extends UnitTestClass {
 	setUp() : void {
@@ -20,7 +20,7 @@ class GuidTest extends UnitTestClass {
 		// Assert
 		for (var i = 0; i < 32; i++) {
 			if (i === 8 || i === 13 || i === 18 || i === 23) {
-				this.areIdentical('-', outcome.charAt(i));
+				Assert.areEqual('-', outcome.charAt(i));
 			} else {
 				var b : boolean = false;
 				for (var j = 0; j < charSet.length && !b; j++) {
@@ -28,10 +28,8 @@ class GuidTest extends UnitTestClass {
 						b = true;
 					}
 				}
-				this.isTrue(b);
+				Assert.isTrue(b);
 			}
 		}
 	}
 }
-
-UnitTestClass.handle(new GuidTest());
diff --git a/testing/system/collections/ArrayListTest.ts b/testing/src/system/collections/ArrayListTest.ts
similarity index 69%
rename from testing/system/collections/ArrayListTest.ts
rename to testing/src/system/collections/ArrayListTest.ts
index aae3c36..c1db34e 100644
--- a/testing/system/collections/ArrayListTest.ts
+++ b/testing/src/system/collections/ArrayListTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../test_dependencies.ts" />
+/// <reference path="../../references.ts" />
 
 class ArrayListTest extends UnitTestClass {
 	private _list : ArrayList<number>;
@@ -21,9 +21,9 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(1, a.length);
-		this.areIdentical(i, a[0]);
+		Assert.isNotNull(a);
+		Assert.areEqual(1, a.length);
+		Assert.areEqual(i, a[0]);
 	}
 
 	ArrayListCloneTest() : void {
@@ -40,12 +40,12 @@ class ArrayListTest extends UnitTestClass {
 		// Assert
 		a = this._list.toArray();
 		b = clonedList.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.isTrue(TSObject.exists(b));
-		this.areIdentical(2, a.length);
-		this.areIdentical(2, b.length);
-		this.areIdentical(a[0], b[0]);
-		this.areIdentical(a[1], b[1]);
+		Assert.isNotNull(a);
+		Assert.isNotNull(b);
+		Assert.areEqual(2, a.length);
+		Assert.areEqual(2, b.length);
+		Assert.areEqual(a[0], b[0]);
+		Assert.areEqual(a[1], b[1]);
 	}
 
 	ArrayListFindFirstTest() : void {
@@ -60,7 +60,7 @@ class ArrayListTest extends UnitTestClass {
 		i = this._list.findFirst(x => x < 5);
 
 		// Assert
-		this.areIdentical(4, i);
+		Assert.areEqual(4, i);
 	}
 
 	ArrayListFindFirstNullTest() : void {
@@ -75,7 +75,7 @@ class ArrayListTest extends UnitTestClass {
 		i = this._list.findFirst(x => x < 4);
 
 		// Assert
-		this.isTrue(i == null);
+		Assert.isTrue(i == null);
 	}
 
 	ArrayListForEachTest() : void {
@@ -96,7 +96,7 @@ class ArrayListTest extends UnitTestClass {
 		);
 
 		// Assert
-		this.areIdentical(2, acc);
+		Assert.areEqual(2, acc);
 	}
 
 	ArrayListGetAtTest() : void {
@@ -110,7 +110,7 @@ class ArrayListTest extends UnitTestClass {
 		i = this._list.getAt(1);
 
 		// Assert
-		this.areIdentical(4, i);
+		Assert.areEqual(4, i);
 	}
 
 	ArrayListGetLengthTest() : void {
@@ -124,7 +124,7 @@ class ArrayListTest extends UnitTestClass {
 		l = this._list.getLength();
 
 		// Assert
-		this.areIdentical(2, l);
+		Assert.areEqual(2, l);
 	}
 
 	ArrayListGetLengthEmptyListTest() : void {
@@ -135,7 +135,7 @@ class ArrayListTest extends UnitTestClass {
 		l = this._list.getLength();
 
 		// Assert
-		this.areIdentical(0, l);
+		Assert.areEqual(0, l);
 	}
 
 	ArrayListInsertAtTest() : void {
@@ -150,11 +150,11 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(3, a.length);
-		this.areIdentical(3, a[0]);
-		this.areIdentical(4, a[1]);
-		this.areIdentical(5, a[2]);
+		Assert.isNotNull(a);
+		Assert.areEqual(3, a.length);
+		Assert.areEqual(3, a[0]);
+		Assert.areEqual(4, a[1]);
+		Assert.areEqual(5, a[2]);
 	}
 
 	ArrayListInsertAtAppendTest() : void {
@@ -169,11 +169,11 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(3, a.length);
-		this.areIdentical(3, a[0]);
-		this.areIdentical(4, a[1]);
-		this.areIdentical(5, a[2]);
+		Assert.isNotNull(a);
+		Assert.areEqual(3, a.length);
+		Assert.areEqual(3, a[0]);
+		Assert.areEqual(4, a[1]);
+		Assert.areEqual(5, a[2]);
 	}
 
 	ArrayListInsertAtAppendEmptyListTest() : void {
@@ -185,16 +185,16 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(1, a.length);
-		this.areIdentical(5, a[0]);
+		Assert.isNotNull(a);
+		Assert.areEqual(1, a.length);
+		Assert.areEqual(5, a[0]);
 	}
 
 	ArrayListInsertAtNegativeIndexTest() : void {
 		// Arrange
 		
 		// Act
-		this.throws(
+		Assert.throws(
 			() => {
 				this._list.insertAt(-5, 2);
 			}
@@ -207,7 +207,7 @@ class ArrayListTest extends UnitTestClass {
 		// Arrange
 		
 		// Act
-		this.throws(
+		Assert.throws(
 			() => {
 				this._list.insertAt(5, 2);
 			}
@@ -229,11 +229,11 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(3, a.length);
-		this.areIdentical(1, a[0]);
-		this.areIdentical(4, a[1]);
-		this.areIdentical(9, a[2]);
+		Assert.isNotNull(a);
+		Assert.areEqual(3, a.length);
+		Assert.areEqual(1, a[0]);
+		Assert.areEqual(4, a[1]);
+		Assert.areEqual(9, a[2]);
 	}
 
 	ArrayListRemoveTest() : void {
@@ -249,10 +249,10 @@ class ArrayListTest extends UnitTestClass {
 
 		// Assert
 		a = this._list.toArray();
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(2, a.length);
-		this.areIdentical(1, a[0]);
-		this.areIdentical(3, a[1]);
+		Assert.isNotNull(a);
+		Assert.areEqual(2, a.length);
+		Assert.areEqual(1, a[0]);
+		Assert.areEqual(3, a[1]);
 	}
 
 	ArrayListRemoveUnvalidValueTest() : void {
@@ -264,7 +264,7 @@ class ArrayListTest extends UnitTestClass {
 		this._list.add(3);
 
 		// Act
-		this.throws(() => this._list.remove(5));
+		Assert.throws(() => this._list.remove(5));
 	}
 
 	ArrayListToArrayTest() : void {
@@ -279,12 +279,10 @@ class ArrayListTest extends UnitTestClass {
 		a = this._list.toArray();
 
 		// Assert
-		this.isTrue(TSObject.exists(a));
-		this.areIdentical(3, a.length);
-		this.areIdentical(1, a[0]);
-		this.areIdentical(2, a[1]);
-		this.areIdentical(3, a[2]);
+		Assert.isNotNull(a);
+		Assert.areEqual(3, a.length);
+		Assert.areEqual(1, a[0]);
+		Assert.areEqual(2, a[1]);
+		Assert.areEqual(3, a[2]);
 	}
 }
-
-UnitTestClass.handle(new ArrayListTest());
diff --git a/testing/src/system/collections/DictionaryTest.ts b/testing/src/system/collections/DictionaryTest.ts
new file mode 100644
index 0000000..cb3c2c6
--- /dev/null
+++ b/testing/src/system/collections/DictionaryTest.ts
@@ -0,0 +1,164 @@
+/// <reference path="../../references.ts" />
+
+class DictionaryTest extends UnitTestClass {
+	private _dict : Dictionary<string, Mocks.Utils.Person>;
+
+	setUp() : void {
+		this._dict = new Dictionary<string, Mocks.Utils.Person>();
+	}
+
+	tearDown() : void {
+		this._dict = null;
+	}
+
+	DictionaryAddTest() : void {
+		// Arrange
+		var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person;
+
+		p1 = new Mocks.Utils.Person('Bruce', 'Willis');
+		p2 = new Mocks.Utils.Person('Mickey', 'Rourke');
+
+		// Act
+		this._dict.add(p1.lastName, p1);
+		this._dict.add(p2.lastName, p2);
+
+		// Assert
+		Assert.areEqual(2, this._dict.getLength());
+		Assert.isTrue(p1.equals(this._dict.get(p1.lastName)));
+		Assert.isTrue(p2.equals(this._dict.get(p2.lastName)));
+	}
+
+	DictionaryCloneTest() : void {
+		// Arrange
+		var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person;
+		var outcome : IDictionary<string, Mocks.Utils.Person>;
+
+		p1 = new Mocks.Utils.Person('Bruce', 'Willis');
+		p2 = new Mocks.Utils.Person('Mickey', 'Rourke');
+		this._dict.add(p1.lastName, p1);
+		this._dict.add(p2.lastName, p2);
+
+		// Act
+		outcome = this._dict.clone();
+
+		// Assert
+		Assert.isNotNull(outcome);
+		Assert.areEqual(this._dict.getLength(), outcome.getLength());
+		Assert.areEqual(this._dict.get(p1.lastName), outcome.get(p1.lastName));
+		Assert.areEqual(this._dict.get(p2.lastName), outcome.get(p2.lastName));
+	}
+
+	DictionaryContainsKeyTest() : void {
+		// Arrange
+		var p : Mocks.Utils.Person;
+		var b : boolean;
+
+		p = new Mocks.Utils.Person('Al', 'Pacino');
+		this._dict.add(p.lastName, p);
+
+		// Act
+		b = this._dict.containsKey('Pacino');
+
+		// Assert
+		Assert.isTrue(b);
+	}
+
+	DictionaryContainsKeyMissingKeyTest() : void {
+		// Arrange
+		var p : Mocks.Utils.Person;
+		var b : boolean;
+
+		p = new Mocks.Utils.Person('Al', 'Pacino');
+		this._dict.add(p.lastName, p);
+
+		// Act
+		b = this._dict.containsKey('foo');
+
+		// Assert
+		Assert.isFalse(b);
+	}
+
+	DictionaryForEachTest() : void {
+		// Arrange
+		var acc : StringBuffer;
+		var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person, p3 : Mocks.Utils.Person, p4 : Mocks.Utils.Person;
+
+		p1 = new Mocks.Utils.Person('John', 'Lennon');
+		p2 = new Mocks.Utils.Person('Paul', 'McCartney');
+		p3 = new Mocks.Utils.Person('Ringo', 'Starr');
+		p4 = new Mocks.Utils.Person('George', 'Harrison');
+		this._dict.add(p1.lastName, p1);
+		this._dict.add(p2.lastName, p2);
+		this._dict.add(p3.lastName, p3);
+		this._dict.add(p4.lastName, p4);
+
+		acc = new StringBuffer();
+
+		// Act
+		this._dict.forEach((k, v) => acc.append(v.firstName));
+
+		// Assert
+		Assert.isTrue(StringHelper.compare('JohnPaulRingoGeorge', acc.toString()));
+	}
+
+	DictionaryGetTest()  : void {
+		// Arrange
+		var p : Mocks.Utils.Person, outcome : Mocks.Utils.Person;
+
+		p = new Mocks.Utils.Person('Samuel L.', 'Jackson');
+		this._dict.add(p.lastName, p);
+
+		// Act
+		outcome = this._dict.get(p.lastName);
+
+		// Assert
+		Assert.isTrue(p.equals(outcome));
+	}
+
+	DictionaryGetFailTest() : void {
+		// Arrange
+		var p : Mocks.Utils.Person, outcome : Mocks.Utils.Person;
+
+		p = new Mocks.Utils.Person('Samuel L.', 'Jackson');
+		this._dict.add(p.lastName, p);
+
+		// Act & Assert
+		Assert.throws(
+			() => {
+				outcome = this._dict.get('foo');
+			}
+		);
+	}
+
+	DictionaryGetLengthTest() : void {
+		// Arrange
+		var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person, p3 : Mocks.Utils.Person, p4 : Mocks.Utils.Person;
+		var n : number;
+
+		p1 = new Mocks.Utils.Person('John', 'Lennon');
+		p2 = new Mocks.Utils.Person('Paul', 'McCartney');
+		p3 = new Mocks.Utils.Person('Ringo', 'Starr');
+		p4 = new Mocks.Utils.Person('George', 'Harrison');
+		this._dict.add(p1.lastName, p1);
+		this._dict.add(p2.lastName, p2);
+		this._dict.add(p3.lastName, p3);
+		this._dict.add(p4.lastName, p4);
+
+		// Act
+		n = this._dict.getLength();
+
+		// Assert
+		Assert.areEqual(4, n);
+	}
+
+	DictionaryGetLengthEmptyListTest() : void {
+		// Arrange
+		var n : number;
+
+		// Act
+		n = this._dict.getLength();
+
+		// Assert
+		Assert.areEqual(0, n);
+	}
+}
diff --git a/testing/system/collections/QueueTest.ts b/testing/src/system/collections/QueueTest.ts
similarity index 71%
rename from testing/system/collections/QueueTest.ts
rename to testing/src/system/collections/QueueTest.ts
index dfc3ede..c785989 100644
--- a/testing/system/collections/QueueTest.ts
+++ b/testing/src/system/collections/QueueTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../test_dependencies.ts" />
+/// <reference path="../../references.ts" />
 
 class QueueTest extends UnitTestClass {
 	private _queue : Queue<number>;
@@ -19,7 +19,7 @@ class QueueTest extends UnitTestClass {
 		this._queue.push(45);
 
 		// Assert
-		this.areIdentical(2, this._queue.getLength());
+		Assert.areEqual(2, this._queue.getLength());
 	}
 
 	QueueTopTest() : void {
@@ -33,7 +33,7 @@ class QueueTest extends UnitTestClass {
 		i = this._queue.top();
 
 		// Assert
-		this.areIdentical(56, i);
+		Assert.areEqual(56, i);
 	}
 
 	QueuePopTest() : void {
@@ -44,10 +44,10 @@ class QueueTest extends UnitTestClass {
 		this._queue.push(45);
 
 		// Act
-		i = this._queue.top();
+		i = this._queue.pop();
 
 		// Assert
-		this.areIdentical(56, i);
-		this.areIdentical(1, this._queue.getLength());
+		Assert.areEqual(56, i);
+		Assert.areEqual(1, this._queue.getLength());
 	}
 }
diff --git a/testing/system/storage/ActiveRecord/ActiveRecordHelperTest.ts b/testing/src/system/storage/ActiveRecord/ActiveRecordHelperTest.ts
similarity index 83%
rename from testing/system/storage/ActiveRecord/ActiveRecordHelperTest.ts
rename to testing/src/system/storage/ActiveRecord/ActiveRecordHelperTest.ts
index 22f4be0..7fa43ca 100644
--- a/testing/system/storage/ActiveRecord/ActiveRecordHelperTest.ts
+++ b/testing/src/system/storage/ActiveRecord/ActiveRecordHelperTest.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../../test_dependencies.ts" />
+/// <reference path="../../../references.ts" />
 
 /**
  * Wraps mocks for ActiveRecordHelper testing
@@ -83,10 +83,10 @@ class ActiveRecordHelperTest extends UnitTestClass {
 		outcome = ActiveRecordHelper.getListFromSQLResultSet(sqlSet, converter);
 
 		// Assert
-		this.areIdentical(3, outcome.getAt(0));
-		this.areIdentical(5, outcome.getAt(1));
-		this.areIdentical(2, outcome.getAt(2));
-		this.areIdentical(0, outcome.getAt(3));
+		Assert.areEqual(3, outcome.getAt(0));
+		Assert.areEqual(5, outcome.getAt(1));
+		Assert.areEqual(2, outcome.getAt(2));
+		Assert.areEqual(0, outcome.getAt(3));
 	}
 
 	/**
@@ -115,11 +115,9 @@ class ActiveRecordHelperTest extends UnitTestClass {
 		outcome = ActiveRecordHelper.getListFromSQLResultSet(sqlSet);
 
 		// Assert
-		this.areIdentical(-3, outcome.getAt(0));
-		this.areIdentical(5, outcome.getAt(1));
-		this.areIdentical(-2, outcome.getAt(2));
-		this.areIdentical(0, outcome.getAt(3));
+		Assert.areEqual(-3, outcome.getAt(0));
+		Assert.areEqual(5, outcome.getAt(1));
+		Assert.areEqual(-2, outcome.getAt(2));
+		Assert.areEqual(0, outcome.getAt(3));
 	}
 }
-
-UnitTestClass.handle(new ActiveRecordHelperTest());
diff --git a/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts b/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts
new file mode 100644
index 0000000..ff608c9
--- /dev/null
+++ b/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts
@@ -0,0 +1,221 @@
+/// <reference path="../../../references.ts" />
+
+class ActiveRecordObjectTest extends UnitTestClass {
+	private _aro : ActiveRecordObject;
+	private _database : Mocks.ARO.Database;
+	private _transaction : Mocks.ARO.Transaction;
+
+	setUp() : void {
+		this._transaction = new Mocks.ARO.Transaction();
+		this._database = new Mocks.ARO.Database();
+		this._database.setTransaction(this._transaction);
+		this._aro = new ActiveRecordObject(this._database);
+	}
+
+	tearDown(): void {
+		this._transaction = null;
+		this._database = null;
+		this._aro = null;
+	}
+
+	ActiveRecordObjectConstructorTest() : void {
+		// Arrange
+		var aro : ActiveRecordObject;
+		var database : ISQLDatabase;
+
+		database = new Mocks.ARO.Database();
+
+		// Act
+		aro = new ActiveRecordObject(database);
+
+		// Assert
+		Assert.isNotNull(aro);
+	}
+
+	ActiveRecordObjectGetAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var p1 : any = {}, p2 : any = {};
+
+		p1.id = 1;
+		p1.firstName = 'Al';
+		p1.lastName = 'Pacino';
+
+		p2.id = 2;
+		p2.firstName = 'Sean';
+		p2.lastName = 'Connery';
+
+		this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p1).push(p2));
+
+		// Act
+		this._aro.get(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual('SELECT * FROM foo', this._transaction.getStatement());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+				Assert.isTrue(Mocks.Utils.Person.toPerson(p1).equals(outcome.getAt(0)));
+				Assert.isTrue(Mocks.Utils.Person.toPerson(p2).equals(outcome.getAt(1)));
+
+				obs.success();
+			},
+			Mocks.Utils.Person.toPerson
+		);
+	}
+
+	ActiveRecordObjectGetWithoutConverterAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var p1 : any = {}, p2 : any = {};
+
+		p1.id = 1;
+		p1.firstName = 'Al';
+		p1.lastName = 'Pacino';
+
+		p2.id = 2;
+		p2.firstName = 'Sean';
+		p2.lastName = 'Connery';
+
+		this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p1).push(p2));
+
+		// Act
+		this._aro.get(
+			'foo',
+			(outcome) => {
+				// Assert
+				Assert.areEqual('SELECT * FROM foo', this._transaction.getStatement());
+				Assert.isNotNull(outcome);
+				Assert.areEqual(2, outcome.getLength());
+				Assert.areEqual(p1, outcome.getAt(0));
+				Assert.areEqual(p2, outcome.getAt(1));
+
+				obs.success();
+			}
+		);
+	}
+
+	ActiveRecordObjectFindAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var p : any = {};
+
+		p.id = 15;
+		p.firstName = 'Al';
+		p.lastName = 'Pacino';
+
+		this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p));
+
+		// Act
+		this._aro.find(
+			'foo',
+			new Pair<string, any>('id', 15),
+			(outcome) => {
+				// Assert
+				Assert.areEqual('SELECT * FROM foo WHERE LOWER(id) = LOWER(?)', this._transaction.getStatement());
+				Assert.areEqual(15, this._transaction.getArguments()[0]);
+				Assert.isNotNull(outcome);
+				Assert.isTrue(Mocks.Utils.Person.toPerson(p).equals(outcome));
+
+				obs.success();
+			},
+			Mocks.Utils.Person.toPerson
+		);
+	}
+
+	ActiveRecordObjectFindWithoutConverterAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var p : any = {};
+
+		p.id = 15;
+		p.firstName = 'Al';
+		p.lastName = 'Pacino';
+
+		this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p));
+
+		// Act
+		this._aro.find(
+			'foo',
+			new Pair<string, any>('id', 15),
+			(outcome) => {
+				// Assert
+				Assert.areEqual('SELECT * FROM foo WHERE LOWER(id) = LOWER(?)', this._transaction.getStatement());
+				Assert.areEqual(15, this._transaction.getArguments()[0]);
+				Assert.isNotNull(outcome);
+				Assert.areEqual(p, outcome);
+				
+				obs.success();
+			}
+		);
+	}
+
+	ActiveRecordObjectInsertAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var data : IList<any>;
+
+		data = new ArrayList<any>();
+		data.add(2);
+		data.add('Hello!');
+		data.add('Bye!');
+
+		// Act
+		this._aro.insert(
+			'bar',
+			data,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+				Assert.areEqual('INSERT INTO bar VALUES (?, ?, ?)', this._transaction.getStatement());
+				Assert.areEqual(data.toArray(), this._transaction.getArguments());
+				
+				obs.success();
+			}
+		);
+	}
+
+	ActiveRecordObjectUpdateAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+		var data : IDictionary<string, any>;
+
+		data = new Dictionary<string, any>();
+		data.add('first_name', 'Robert');
+		data.add('last_name', 'De Niro');
+
+		// Act
+		this._aro.update(
+			'people',
+			new Pair<string, any>('id', 15),
+			data,
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+				Assert.areEqual(
+					'UPDATE people SET first_name = ?, last_name = ? WHERE id = ?',
+					this._transaction.getStatement()
+				);
+
+				Assert.areEqual(3, this._transaction.getArguments().length);
+				Assert.areEqual('Robert', this._transaction.getArguments()[0]);
+				Assert.areEqual('De Niro', this._transaction.getArguments()[1]);
+				Assert.areEqual(15, this._transaction.getArguments()[2]);
+				
+				obs.success();
+			}
+		);
+	}
+
+	ActiveRecordObjectDeleteAsyncTest(obs : IOscarObserver) : void {
+		// Arrange
+
+		// Act
+		this._aro.delete(
+			'foobar',
+			new Pair<string, any>('id', 15),
+			(success) => {
+				// Assert
+				Assert.isTrue(success);
+				Assert.areEqual('DELETE FROM foobar WHERE id = ?', this._transaction.getStatement());
+				Assert.areEqual(15, this._transaction.getArguments()[0]);
+				
+				obs.success();
+			}
+		);
+	}
+}
diff --git a/testing/system/collections/DictionaryTest.ts b/testing/system/collections/DictionaryTest.ts
deleted file mode 100644
index 3f2c41d..0000000
--- a/testing/system/collections/DictionaryTest.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/// <reference path="../../test_dependencies.ts" />
-
-module DictionaryTestUtils {
-	export class Person extends TSObject {
-		firstName : string;
-		lastName : string;
-
-		constructor(firstName : string = null, lastName : string = null) {
-			super();
-
-			this.firstName = firstName;
-			this.lastName = lastName;
-		}
-
-		equals(p : Person) {
-			return StringHelper.compare(this.firstName, p.firstName)
-			&& StringHelper.compare(this.lastName, p.lastName);
-		}
-	}
-}
-
-import Person = DictionaryTestUtils.Person;
-
-class DictionaryTest extends UnitTestClass {
-	private _dict : Dictionary<string, Person>;
-
-	setUp() : void {
-		this._dict = new Dictionary<string, Person>();
-	}
-
-	tearDown() : void {
-		this._dict = null;
-	}
-
-	DictionaryAddTest() : void {
-		// Arrange
-		var p1 : Person, p2 : Person;
-
-		p1 = new Person('Bruce', 'Willis');
-		p2 = new Person('Mickey', 'Rourke');
-
-		// Act
-		this._dict.add(p1.lastName, p1);
-		this._dict.add(p2.lastName, p2);
-
-		// Assert
-		this.areIdentical(2, this._dict.getLength());
-		this.isTrue(p1.equals(this._dict.get(p1.lastName)));
-		this.isTrue(p2.equals(this._dict.get(p2.lastName)));
-	}
-
-	DictionaryCloneTest() : void {
-		// Arrange
-		var p1 : Person, p2 : Person;
-		var outcome : IDictionary<string, Person>;
-
-		p1 = new Person('Bruce', 'Willis');
-		p2 = new Person('Mickey', 'Rourke');
-		this._dict.add(p1.lastName, p1);
-		this._dict.add(p2.lastName, p2);
-
-		// Act
-		outcome = this._dict.clone();
-
-		// Assert
-		this.isTrue(TSObject.exists(outcome));
-		this.areIdentical(this._dict.getLength(), outcome.getLength());
-		this.areIdentical(this._dict.get(p1.lastName), outcome.get(p1.lastName));
-		this.areIdentical(this._dict.get(p2.lastName), outcome.get(p2.lastName));
-	}
-
-	DictionaryContainsKeyTest() : void {
-		// Arrange
-		var p : Person;
-		var b : boolean;
-
-		p = new Person('Al', 'Pacino');
-		this._dict.add(p.lastName, p);
-
-		// Act
-		b = this._dict.containsKey('Pacino');
-
-		// Assert
-		this.isTrue(b);
-	}
-
-	DictionaryContainsKeyMissingKeyTest() : void {
-		// Arrange
-		var p : Person;
-		var b : boolean;
-
-		p = new Person('Al', 'Pacino');
-		this._dict.add(p.lastName, p);
-
-		// Act
-		b = this._dict.containsKey('foo');
-
-		// Assert
-		this.isFalse(b);
-	}
-
-	DictionaryForEachTest() : void {
-		// Arrange
-		var acc : StringBuffer;
-		var p1 : Person, p2 : Person, p3 : Person, p4 : Person;
-
-		p1 = new Person('John', 'Lennon');
-		p2 = new Person('Paul', 'McCartney');
-		p3 = new Person('Ringo', 'Starr');
-		p4 = new Person('George', 'Harrison');
-		this._dict.add(p1.lastName, p1);
-		this._dict.add(p2.lastName, p2);
-		this._dict.add(p3.lastName, p3);
-		this._dict.add(p4.lastName, p4);
-
-		acc = new StringBuffer();
-
-		// Act
-		this._dict.forEach((k, v) => acc.append(v.firstName));
-
-		// Assert
-		this.isTrue(StringHelper.compare('JohnPaulRingoGeorge', acc.toString()));
-	}
-
-	DictionaryGetTest()  : void {
-		// Arrange
-		var p : Person, outcome : Person;
-
-		p = new Person('Samuel L.', 'Jackson');
-		this._dict.add(p.lastName, p);
-
-		// Act
-		outcome = this._dict.get(p.lastName);
-
-		// Assert
-		this.isTrue(p.equals(outcome));
-	}
-
-	DictionaryGetFailTest() : void {
-		// Arrange
-		var p : Person, outcome : Person;
-
-		p = new Person('Samuel L.', 'Jackson');
-		this._dict.add(p.lastName, p);
-
-		// Act & Assert
-		this.throws(
-			() => {
-				outcome = this._dict.get('foo');
-			}
-		);
-	}
-
-	DictionaryGetLengthTest() : void {
-		// Arrange
-		var p1 : Person, p2 : Person, p3 : Person, p4 : Person;
-		var n : number;
-
-		p1 = new Person('John', 'Lennon');
-		p2 = new Person('Paul', 'McCartney');
-		p3 = new Person('Ringo', 'Starr');
-		p4 = new Person('George', 'Harrison');
-		this._dict.add(p1.lastName, p1);
-		this._dict.add(p2.lastName, p2);
-		this._dict.add(p3.lastName, p3);
-		this._dict.add(p4.lastName, p4);
-
-		// Act
-		n = this._dict.getLength();
-
-		// Assert
-		this.areIdentical(4, n);
-	}
-
-	DictionaryGetLengthEmptyListTest() : void {
-		// Arrange
-		var n : number;
-
-		// Act
-		n = this._dict.getLength();
-
-		// Assert
-		this.areIdentical(0, n);
-	}
-}
-
-UnitTestClass.handle(new DictionaryTest());
diff --git a/testing/system/storage/ActiveRecord/ActiveRecordObjectTest.ts b/testing/system/storage/ActiveRecord/ActiveRecordObjectTest.ts
deleted file mode 100644
index 661c7ae..0000000
--- a/testing/system/storage/ActiveRecord/ActiveRecordObjectTest.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-/// <reference path="../../../test_dependencies.ts" />
-
-class ActiveRecordObjectTest extends UnitTestClass {
-	private _aro : ActiveRecordObject;
-	private _database : Mocks.ARO.Database;
-	private _transaction : Mocks.ARO.Transaction;
-
-	private _setUp() : void {
-		this._transaction = new Mocks.ARO.Transaction();
-		this._database = new Mocks.ARO.Database();
-		this._database.setTransaction(this._transaction);
-		this._aro = new ActiveRecordObject(this._database);
-	}
-
-	private _tearDown(): void {
-		this._transaction = null;
-		this._database = null;
-		this._aro = null;
-	}
-
-	ActiveRecordObjectConstructorTest() : void {
-		// Arrange
-		var aro : ActiveRecordObject;
-		var database : ISQLDatabase;
-
-		database = new Mocks.ARO.Database();
-
-		// Act
-		aro = new ActiveRecordObject(database);
-
-		// Assert
-		this.isTrue(TSObject.exists(aro));
-	}
-
-	ActiveRecordObjectGetTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var p1 : any = {}, p2 : any = {};
-
-				this._setUp();
-
-				p1.id = 1;
-				p1.firstName = 'Al';
-				p1.lastName = 'Pacino';
-
-				p2.id = 2;
-				p2.firstName = 'Sean';
-				p2.lastName = 'Connery';
-
-				this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p1).push(p2));
-
-				// Act
-				this._aro.get(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical('SELECT * FROM foo', this._transaction.getStatement());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-						this.isTrue(Mocks.Utils.Person.toPerson(p1).equals(outcome.getAt(0)));
-						this.isTrue(Mocks.Utils.Person.toPerson(p2).equals(outcome.getAt(1)));
-
-						this._tearDown();
-						UnitTestClass.done();
-					},
-					Mocks.Utils.Person.toPerson
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectGetWithoutConverterTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var p1 : any = {}, p2 : any = {};
-
-				this._setUp();
-
-				p1.id = 1;
-				p1.firstName = 'Al';
-				p1.lastName = 'Pacino';
-
-				p2.id = 2;
-				p2.firstName = 'Sean';
-				p2.lastName = 'Connery';
-
-				this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p1).push(p2));
-
-				// Act
-				this._aro.get(
-					'foo',
-					(outcome) => {
-						// Assert
-						this.areIdentical('SELECT * FROM foo', this._transaction.getStatement());
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(2, outcome.getLength());
-						this.areIdentical(p1, outcome.getAt(0));
-						this.areIdentical(p2, outcome.getAt(1));
-
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectFindTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var p : any = {};
-
-				this._setUp();
-
-				p.id = 15;
-				p.firstName = 'Al';
-				p.lastName = 'Pacino';
-
-				this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p));
-
-				// Act
-				this._aro.find(
-					'foo',
-					new Pair<string, any>('id', 15),
-					(outcome) => {
-						// Assert
-						this.areIdentical('SELECT * FROM foo WHERE id = ?', this._transaction.getStatement());
-						this.areIdentical(15, this._transaction.getArguments()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.isTrue(Mocks.Utils.Person.toPerson(p).equals(outcome));
-
-						this._tearDown();
-						UnitTestClass.done();
-					},
-					Mocks.Utils.Person.toPerson
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectFindWithoutConverterTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var p : any = {};
-
-				this._setUp();
-
-				p.id = 15;
-				p.firstName = 'Al';
-				p.lastName = 'Pacino';
-
-				this._transaction.setSuccessOutcome(new Mocks.ARO.SQLRowSet().push(p));
-
-				// Act
-				this._aro.find(
-					'foo',
-					new Pair<string, any>('id', 15),
-					(outcome) => {
-						// Assert
-						this.areIdentical('SELECT * FROM foo WHERE id = ?', this._transaction.getStatement());
-						this.areIdentical(15, this._transaction.getArguments()[0]);
-						this.isTrue(TSObject.exists(outcome));
-						this.areIdentical(p, outcome);
-						
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectInsertTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var data : IList<any>;
-
-				this._setUp();
-
-				data = new ArrayList<any>();
-				data.add(2);
-				data.add('Hello!');
-				data.add('Bye!');
-
-				// Act
-				this._aro.insert(
-					'bar',
-					data,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-						this.areIdentical('INSERT INTO bar VALUES (?, ?, ?)', this._transaction.getStatement());
-						this.areIdentical(data.toArray(), this._transaction.getArguments());
-						
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectUpdateTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				var data : IDictionary<string, any>;
-
-				this._setUp();
-
-				data = new Dictionary<string, any>();
-				data.add('first_name', 'Robert');
-				data.add('last_name', 'De Niro');
-
-				// Act
-				this._aro.update(
-					'people',
-					new Pair<string, any>('id', 15),
-					data,
-					(success) => {
-						// Assert
-						this.isTrue(success);
-						this.areIdentical(
-							'UPDATE people SET first_name = ?, last_name = ? WHERE id = ?',
-							this._transaction.getStatement()
-						);
-
-						this.areIdentical(3, this._transaction.getArguments().length);
-						this.areIdentical('Robert', this._transaction.getArguments()[0]);
-						this.areIdentical('De Niro', this._transaction.getArguments()[1]);
-						this.areIdentical(15, this._transaction.getArguments()[2]);
-						
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-
-	ActiveRecordObjectDeleteTest() : void {
-		UnitTestClass.queue(
-			() => {
-				// Arrange
-				this._setUp();
-
-				// Act
-				this._aro.delete(
-					'foobar',
-					new Pair<string, any>('id', 15),
-					(success) => {
-						// Assert
-						this.isTrue(success);
-						this.areIdentical('DELETE FROM foobar WHERE id = ?', this._transaction.getStatement());
-						this.areIdentical(15, this._transaction.getArguments()[0]);
-						
-						this._tearDown();
-						UnitTestClass.done();
-					}
-				);
-			}
-		);
-	}
-}
-
-UnitTestClass.handle(new ActiveRecordObjectTest());