diff --git a/chai/chai-assert-test.ts b/chai/chai-assert-test.ts
new file mode 100644
index 000000000..b4a5a15be
--- /dev/null
+++ b/chai/chai-assert-test.ts
@@ -0,0 +1,671 @@
+/*
+
+---------
+  test extracted from original test suite
+  chai original licence follows
+---------
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+///<reference path="chai-assert.d.ts" />
+
+//stubs
+declare module chai {
+	var AssertionError;
+	function expect(body):any;
+}
+//tdd
+declare function suite(description, action):void;
+declare function test(description, action):void;
+declare function err(action, msg?):void;
+interface FieldObj {
+	field: any;
+}
+
+suite('assert', function () {
+
+	test('assert', function () {
+		var foo = 'bar';
+		assert(foo == 'bar', "expected foo to equal `bar`");
+
+		err(function () {
+			assert(foo == 'baz', "expected foo to equal `bar`");
+		}, "expected foo to equal `bar`");
+	});
+
+	test('fail', function () {
+		chai.expect(function () {
+			assert.fail();
+		}).to.throw(chai.AssertionError);
+	});
+
+	test('isTrue', function () {
+		assert.isTrue(true);
+
+		err(function () {
+			assert.isTrue(false);
+		}, "expected false to be true");
+
+		err(function () {
+			assert.isTrue(1);
+		}, "expected 1 to be true");
+
+		err(function () {
+			assert.isTrue('test');
+		}, "expected 'test' to be true");
+	});
+
+	test('ok', function () {
+		assert.ok(true);
+		assert.ok(1);
+		assert.ok('test');
+
+		err(function () {
+			assert.ok(false);
+		}, "expected false to be truthy");
+
+		err(function () {
+			assert.ok(0);
+		}, "expected 0 to be truthy");
+
+		err(function () {
+			assert.ok('');
+		}, "expected '' to be truthy");
+	});
+
+	test('isFalse', function () {
+		assert.isFalse(false);
+
+		err(function () {
+			assert.isFalse(true);
+		}, "expected true to be false");
+
+		err(function () {
+			assert.isFalse(0);
+		}, "expected 0 to be false");
+	});
+
+	test('equal', function () {
+		var foo;
+		assert.equal(foo, undefined);
+	});
+
+	test('typeof / notTypeOf', function () {
+		assert.typeOf('test', 'string');
+		assert.typeOf(true, 'boolean');
+		assert.typeOf(5, 'number');
+
+		err(function () {
+			assert.typeOf(5, 'string');
+		}, "expected 5 to be a string");
+
+	});
+
+	test('notTypeOf', function () {
+		assert.notTypeOf('test', 'number');
+
+		err(function () {
+			assert.notTypeOf(5, 'number');
+		}, "expected 5 not to be a number");
+	});
+
+	test('instanceOf', function () {
+		function Foo() {
+		}
+
+		assert.instanceOf(new Foo(), Foo);
+
+		err(function () {
+			assert.instanceOf(5, Foo);
+		}, "expected 5 to be an instance of Foo");
+
+		function CrashyObject() {
+		};
+		CrashyObject.prototype.inspect = function () {
+			throw new Error("Arg's inspect() called even though the test passed");
+		};
+		assert.instanceOf(new CrashyObject(), CrashyObject);
+	});
+
+	test('notInstanceOf', function () {
+		function Foo() {
+		}
+
+		assert.notInstanceOf(new Foo(), String);
+
+		err(function () {
+			assert.notInstanceOf(new Foo(), Foo);
+		}, "expected {} to not be an instance of Foo");
+	});
+
+	test('isObject', function () {
+		function Foo() {
+		}
+
+		assert.isObject({});
+		assert.isObject(new Foo());
+
+		err(function () {
+			assert.isObject(true);
+		}, "expected true to be an object");
+
+		err(function () {
+			assert.isObject(Foo);
+		}, "expected [Function: Foo] to be an object");
+
+		err(function () {
+			assert.isObject('foo');
+		}, "expected 'foo' to be an object");
+	});
+
+	test('isNotObject', function () {
+		function Foo() {
+		}
+
+		assert.isNotObject(5);
+
+		err(function () {
+			assert.isNotObject({});
+		}, "expected {} not to be an object");
+	});
+
+	test('notEqual', function () {
+		assert.notEqual(3, 4);
+
+		err(function () {
+			assert.notEqual(5, 5);
+		}, "expected 5 to not equal 5");
+	});
+
+	test('strictEqual', function () {
+		assert.strictEqual('foo', 'foo');
+
+		err(function () {
+			assert.strictEqual('5', 5);
+		}, "expected \'5\' to equal 5");
+	});
+
+	test('notStrictEqual', function () {
+		assert.notStrictEqual(5, '5');
+
+		err(function () {
+			assert.notStrictEqual(5, 5);
+		}, "expected 5 to not equal 5");
+	});
+
+	test('deepEqual', function () {
+		assert.deepEqual({tea: 'chai'}, {tea: 'chai'});
+
+		err(function () {
+			assert.deepEqual({tea: 'chai'}, {tea: 'black'});
+		}, "expected { tea: \'chai\' } to deeply equal { tea: \'black\' }");
+
+		var obja = Object.create({ tea: 'chai' })
+		, objb = Object.create({ tea: 'chai' });
+
+		assert.deepEqual(obja, objb);
+
+		var obj1 = Object.create({tea: 'chai'})
+		, obj2 = Object.create({tea: 'black'});
+
+		err(function () {
+			assert.deepEqual(obj1, obj2);
+		}, "expected { tea: \'chai\' } to deeply equal { tea: \'black\' }");
+	});
+
+	test('deepEqual (ordering)', function () {
+		var a = { a: 'b', c: 'd' }
+		, b = { c: 'd', a: 'b' };
+		assert.deepEqual(a, b);
+	});
+
+	test('deepEqual (circular)', function () {
+		var circularObject:any = {}
+		, secondCircularObject:any = {};
+		circularObject.field = circularObject;
+		secondCircularObject.field = secondCircularObject;
+
+		assert.deepEqual(circularObject, secondCircularObject);
+
+		err(function () {
+			secondCircularObject.field2 = secondCircularObject;
+			assert.deepEqual(circularObject, secondCircularObject);
+		}, "expected { field: [Circular] } to deeply equal { Object (field, field2) }");
+	});
+
+	test('notDeepEqual', function () {
+		assert.notDeepEqual({tea: 'jasmine'}, {tea: 'chai'});
+		err(function () {
+			assert.notDeepEqual({tea: 'chai'}, {tea: 'chai'});
+		}, "expected { tea: \'chai\' } to not deeply equal { tea: \'chai\' }");
+	});
+
+	test('notDeepEqual (circular)', function () {
+		var circularObject:any = {}
+		, secondCircularObject:any = { tea: 'jasmine' };
+		circularObject.field = circularObject;
+		secondCircularObject.field = secondCircularObject;
+
+		assert.notDeepEqual(circularObject, secondCircularObject);
+
+		err(function () {
+			delete secondCircularObject.tea;
+			assert.notDeepEqual(circularObject, secondCircularObject);
+		}, "expected { field: [Circular] } to not deeply equal { field: [Circular] }");
+	});
+
+	test('isNull', function () {
+		assert.isNull(null);
+
+		err(function () {
+			assert.isNull(undefined);
+		}, "expected undefined to equal null");
+	});
+
+	test('isNotNull', function () {
+		assert.isNotNull(undefined);
+
+		err(function () {
+			assert.isNotNull(null);
+		}, "expected null to not equal null");
+	});
+
+	test('isUndefined', function () {
+		assert.isUndefined(undefined);
+
+		err(function () {
+			assert.isUndefined(null);
+		}, "expected null to equal undefined");
+	});
+
+	test('isDefined', function () {
+		assert.isDefined(null);
+
+		err(function () {
+			assert.isDefined(undefined);
+		}, "expected undefined to not equal undefined");
+	});
+
+	test('isFunction', function () {
+		var func = function () {
+		};
+		assert.isFunction(func);
+
+		err(function () {
+			assert.isFunction({});
+		}, "expected {} to be a function");
+	});
+
+	test('isNotFunction', function () {
+		assert.isNotFunction(5);
+
+		err(function () {
+			assert.isNotFunction(function () {
+			});
+		}, "expected [Function] not to be a function");
+	});
+
+	test('isArray', function () {
+		assert.isArray([]);
+		assert.isArray(new Array);
+
+		err(function () {
+			assert.isArray({});
+		}, "expected {} to be an array");
+	});
+
+	test('isNotArray', function () {
+		assert.isNotArray(3);
+
+		err(function () {
+			assert.isNotArray([]);
+		}, "expected [] not to be an array");
+
+		err(function () {
+			assert.isNotArray(new Array);
+		}, "expected [] not to be an array");
+	});
+
+	test('isString', function () {
+		assert.isString('Foo');
+		assert.isString(new String('foo'));
+
+		err(function () {
+			assert.isString(1);
+		}, "expected 1 to be a string");
+	});
+
+	test('isNotString', function () {
+		assert.isNotString(3);
+		assert.isNotString([ 'hello' ]);
+
+		err(function () {
+			assert.isNotString('hello');
+		}, "expected 'hello' not to be a string");
+	});
+
+	test('isNumber', function () {
+		assert.isNumber(1);
+		assert.isNumber(Number('3'));
+
+		err(function () {
+			assert.isNumber('1');
+		}, "expected \'1\' to be a number");
+	});
+
+	test('isNotNumber', function () {
+		assert.isNotNumber('hello');
+		assert.isNotNumber([ 5 ]);
+
+		err(function () {
+			assert.isNotNumber(4);
+		}, "expected 4 not to be a number");
+	});
+
+	test('isBoolean', function () {
+		assert.isBoolean(true);
+		assert.isBoolean(false);
+
+		err(function () {
+			assert.isBoolean('1');
+		}, "expected \'1\' to be a boolean");
+	});
+
+	test('isNotBoolean', function () {
+		assert.isNotBoolean('true');
+
+		err(function () {
+			assert.isNotBoolean(true);
+		}, "expected true not to be a boolean");
+
+		err(function () {
+			assert.isNotBoolean(false);
+		}, "expected false not to be a boolean");
+	});
+
+	test('include', function () {
+		assert.include('foobar', 'bar');
+		assert.include([ 1, 2, 3], 3);
+
+		err(function () {
+			assert.include('foobar', 'baz');
+		}, "expected \'foobar\' to contain \'baz\'");
+
+		err(function () {
+			assert.include(undefined, 'bar');
+		}, "expected an array or string");
+	});
+
+	test('notInclude', function () {
+		assert.notInclude('foobar', 'baz');
+		assert.notInclude([ 1, 2, 3 ], 4);
+
+		err(function () {
+			assert.notInclude('foobar', 'bar');
+		}, "expected \'foobar\' to not contain \'bar\'");
+
+		err(function () {
+			assert.notInclude(undefined, 'bar');
+		}, "expected an array or string");
+	});
+
+	test('lengthOf', function () {
+		assert.lengthOf([1, 2, 3], 3);
+		assert.lengthOf('foobar', 6);
+
+		err(function () {
+			assert.lengthOf('foobar', 5);
+		}, "expected 'foobar' to have a length of 5 but got 6");
+
+		err(function () {
+			assert.lengthOf(1, 5);
+		}, "expected 1 to have a property \'length\'");
+	});
+
+	test('match', function () {
+		assert.match('foobar', /^foo/);
+		assert.notMatch('foobar', /^bar/);
+
+		err(function () {
+			assert.match('foobar', /^bar/i);
+		}, "expected 'foobar' to match /^bar/i");
+
+		err(function () {
+			assert.notMatch('foobar', /^foo/i);
+		}, "expected 'foobar' not to match /^foo/i");
+	});
+
+	test('property', function () {
+		var obj = { foo: { bar: 'baz' } };
+		var simpleObj = { foo: 'bar' };
+		assert.property(obj, 'foo');
+		assert.deepProperty(obj, 'foo.bar');
+		assert.notProperty(obj, 'baz');
+		assert.notProperty(obj, 'foo.bar');
+		assert.notDeepProperty(obj, 'foo.baz');
+		assert.deepPropertyVal(obj, 'foo.bar', 'baz');
+		assert.deepPropertyNotVal(obj, 'foo.bar', 'flow');
+
+		err(function () {
+			assert.property(obj, 'baz');
+		}, "expected { foo: { bar: 'baz' } } to have a property 'baz'");
+
+		err(function () {
+			assert.deepProperty(obj, 'foo.baz');
+		}, "expected { foo: { bar: 'baz' } } to have a deep property 'foo.baz'");
+
+		err(function () {
+			assert.notProperty(obj, 'foo');
+		}, "expected { foo: { bar: 'baz' } } to not have property 'foo'");
+
+		err(function () {
+			assert.notDeepProperty(obj, 'foo.bar');
+		}, "expected { foo: { bar: 'baz' } } to not have deep property 'foo.bar'");
+
+		err(function () {
+			assert.propertyVal(simpleObj, 'foo', 'ball');
+		}, "expected { foo: 'bar' } to have a property 'foo' of 'ball', but got 'bar'");
+
+		err(function () {
+			assert.deepPropertyVal(obj, 'foo.bar', 'ball');
+		}, "expected { foo: { bar: 'baz' } } to have a deep property 'foo.bar' of 'ball', but got 'baz'");
+
+		err(function () {
+			assert.propertyNotVal(simpleObj, 'foo', 'bar');
+		}, "expected { foo: 'bar' } to not have a property 'foo' of 'bar'");
+
+		err(function () {
+			assert.deepPropertyNotVal(obj, 'foo.bar', 'baz');
+		}, "expected { foo: { bar: 'baz' } } to not have a deep property 'foo.bar' of 'baz'");
+	});
+
+	test('throws', function () {
+		assert.throws(function () {
+			throw new Error('foo');
+		});
+		assert.throws(function () {
+			throw new Error('bar');
+		}, 'bar');
+		assert.throws(function () {
+			throw new Error('bar');
+		}, /bar/);
+		assert.throws(function () {
+			throw new Error('bar');
+		}, Error);
+		assert.throws(function () {
+			throw new Error('bar');
+		}, Error, 'bar');
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('foo')
+			}, TypeError);
+		}, "expected [Function] to throw 'TypeError' but [Error: foo] was thrown")
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('foo')
+			}, 'bar');
+		}, "expected [Function] to throw error including 'bar' but got 'foo'")
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('foo')
+			}, Error, 'bar');
+		}, "expected [Function] to throw error including 'bar' but got 'foo'")
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('foo')
+			}, TypeError, 'bar');
+		}, "expected [Function] to throw 'TypeError' but [Error: foo] was thrown")
+
+		err(function () {
+			assert.throws(function () {
+			});
+		}, "expected [Function] to throw an error");
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('')
+			}, 'bar');
+		}, "expected [Function] to throw error including 'bar' but got ''");
+
+		err(function () {
+			assert.throws(function () {
+				throw new Error('')
+			}, /bar/);
+		}, "expected [Function] to throw error matching /bar/ but got ''");
+	});
+
+	test('doesNotThrow', function () {
+		assert.doesNotThrow(function () {
+		});
+		assert.doesNotThrow(function () {
+		}, 'foo');
+
+		err(function () {
+			assert.doesNotThrow(function () {
+				throw new Error('foo');
+			});
+		}, 'expected [Function] to not throw an error but [Error: foo] was thrown');
+	});
+
+	test('ifError', function () {
+		assert.ifError(false);
+		assert.ifError(null);
+		assert.ifError(undefined);
+
+		err(function () {
+			assert.ifError('foo');
+		}, "expected \'foo\' to be falsy");
+	});
+
+	test('operator', function () {
+		assert.operator(1, '<', 2);
+		assert.operator(2, '>', 1);
+		assert.operator(1, '==', 1);
+		assert.operator(1, '<=', 1);
+		assert.operator(1, '>=', 1);
+		assert.operator(1, '!=', 2);
+		assert.operator(1, '!==', 2);
+
+		err(function () {
+			assert.operator(1, '=', 2);
+		}, 'Invalid operator "="');
+
+		err(function () {
+			assert.operator(2, '<', 1);
+		}, "expected 2 to be < 1");
+
+		err(function () {
+			assert.operator(1, '>', 2);
+		}, "expected 1 to be > 2");
+
+		err(function () {
+			assert.operator(1, '==', 2);
+		}, "expected 1 to be == 2");
+
+		err(function () {
+			assert.operator(2, '<=', 1);
+		}, "expected 2 to be <= 1");
+
+		err(function () {
+			assert.operator(1, '>=', 2);
+		}, "expected 1 to be >= 2");
+
+		err(function () {
+			assert.operator(1, '!=', 1);
+		}, "expected 1 to be != 1");
+
+		err(function () {
+			assert.operator(1, '!==', '1');
+		}, "expected 1 to be !== \'1\'");
+	});
+
+	test('closeTo', function () {
+		assert.closeTo(1.5, 1.0, 0.5);
+		assert.closeTo(10, 20, 20);
+		assert.closeTo(-10, 20, 30);
+
+		err(function () {
+			assert.closeTo(2, 1.0, 0.5);
+		}, "expected 2 to be close to 1 +/- 0.5");
+
+		err(function () {
+			assert.closeTo(-10, 20, 29);
+		}, "expected -10 to be close to 20 +/- 29");
+	});
+
+	test('members', function () {
+		assert.includeMembers([1, 2, 3], [2, 3]);
+		assert.includeMembers([1, 2, 3], []);
+		assert.includeMembers([1, 2, 3], [3]);
+
+		err(function () {
+			assert.includeMembers([5, 6], [7, 8]);
+		}, 'expected [ 5, 6 ] to be a superset of [ 7, 8 ]');
+
+		err(function () {
+			assert.includeMembers([5, 6], [5, 6, 0]);
+		}, 'expected [ 5, 6 ] to be a superset of [ 5, 6, 0 ]');
+	});
+
+	test('memberEquals', function () {
+		assert.sameMembers([], []);
+		assert.sameMembers([1, 2, 3], [3, 2, 1]);
+		assert.sameMembers([4, 2], [4, 2]);
+
+		err(function () {
+			assert.sameMembers([], [1, 2]);
+		}, 'expected [] to have the same members as [ 1, 2 ]');
+
+		err(function () {
+			assert.sameMembers([1, 54], [6, 1, 54]);
+		}, 'expected [ 1, 54 ] to have the same members as [ 6, 1, 54 ]');
+	});
+
+});
diff --git a/chai/chai-assert.d.ts b/chai/chai-assert.d.ts
new file mode 100644
index 000000000..b31b7bde5
--- /dev/null
+++ b/chai/chai-assert.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for chai v1.6.0 assert style
+// Project: http://chaijs.com/
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module chai
+{
+	interface Assert
+	{
+		(express:any, msg?:string);
+
+		fail(actual?:any, expected?:any, msg?:string, operator?:string);
+		ok(val:any, msg?:string);
+
+		equal(act:any, exp:any, msg?:string);
+		notEqual(act:any, exp:any, msg?:string);
+
+		strictEqual(act:any, exp:any, msg?:string);
+		notStrictEqual(act:any, exp:any, msg?:string);
+
+		deepEqual(act:any, exp:any, msg?:string);
+		notDeepEqual(act:any, exp:any, msg?:string);
+
+		isTrue(val:any, msg?:string);
+		isFalse(val:any, msg?:string);
+
+		isNull(val:any, msg?:string);
+		isNotNull(val:any, msg?:string);
+
+		isUndefined(val:any, msg?:string);
+		isDefined(val:any, msg?:string);
+
+		isFunction(val:any, msg?:string);
+		isNotFunction(val:any, msg?:string);
+
+		isObject(val:any, msg?:string);
+		isNotObject(val:any, msg?:string);
+
+		isArray(val:any, msg?:string);
+		isNotArray(val:any, msg?:string);
+
+		isString(val:any, msg?:string);
+		isNotString(val:any, msg?:string);
+
+		isNumber(val:any, msg?:string);
+		isNotNumber(val:any, msg?:string);
+
+		isBoolean(val:any, msg?:string);
+		isNotBoolean(val:any, msg?:string);
+
+		typeOf(val:any, type:string, msg?:string);
+		notTypeOf(val:any, type:string, msg?:string);
+
+		instanceOf(val:any, type:Function, msg?:string);
+		notInstanceOf(val:any, type:Function, msg?:string);
+
+		include(exp:string, inc:any, msg?:string);
+		include(exp:any[], inc:any, msg?:string);
+
+		notInclude(exp:string, inc:any, msg?:string);
+		notInclude(exp:any[], inc:any, msg?:string);
+
+		match(exp:any, re:RegExp, msg?:string);
+		notMatch(exp:any, re:RegExp, msg?:string);
+
+		property(obj:Object, prop:string, msg?:string);
+		notProperty(obj:Object, prop:string, msg?:string);
+		deepProperty(obj:Object, prop:string, msg?:string);
+		notDeepProperty(obj:Object, prop:string, msg?:string);
+
+		propertyVal(obj:Object, prop:string, val:any, msg?:string);
+		propertyNotVal(obj:Object, prop:string, val:any, msg?:string);
+
+
+		deepPropertyVal(obj:Object, prop:string, val:any, msg?:string);
+		deepPropertyNotVal(obj:Object, prop:string, val:any, msg?:string);
+
+		lengthOf(exp:any, len:number, msg?:string);
+
+		//alias frenzy
+		throw(fn:Function, msg?:string);
+		throw(fn:Function, regExp:RegExp);
+		throw(fn:Function, errType:Function, msg?:string);
+		throw(fn:Function, errType:Function, regExp:RegExp);
+
+		throws(fn:Function, msg?:string);
+		throws(fn:Function, regExp:RegExp);
+		throws(fn:Function, errType:Function, msg?:string);
+		throws(fn:Function, errType:Function, regExp:RegExp);
+
+		Throw(fn:Function, msg?:string);
+		Throw(fn:Function, regExp:RegExp);
+		Throw(fn:Function, errType:Function, msg?:string);
+		Throw(fn:Function, errType:Function, regExp:RegExp);
+
+		doesNotThrow(fn:Function, msg?:string);
+		doesNotThrow(fn:Function, regExp:RegExp);
+		doesNotThrow(fn:Function, errType:Function, msg?:string);
+		doesNotThrow(fn:Function, errType:Function, regExp:RegExp);
+
+		operator(val:any, operator:string, val2:any, msg?:string);
+		closeTo(act:number, exp:number, delta:number, msg?:string);
+
+		sameMembers(set1:any[], set2:any[], msg?:string);
+		includeMembers(set1:any[], set2:any[], msg?:string);
+
+		ifError(val:any, msg?:string);
+	}
+	//node module
+	declare var assert:Assert;
+}
+//browser global
+declare var assert:chai.Assert;
\ No newline at end of file