diff --git a/vim/UltiSnips/javascript-jasmine.snippets b/vim/UltiSnips/javascript-jasmine.snippets
deleted file mode 100644
index 77aec77..0000000
--- a/vim/UltiSnips/javascript-jasmine.snippets
+++ /dev/null
@@ -1,218 +0,0 @@
-priority -50
-
-# JavaScript versions -- from the TextMate bundle + some additions
-# for jasmine-jquery matchers
-#
-
-snippet des "Describe (js)" b
-describe('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet it "it (js)" b
-it('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet bef "before each (js)" b
-beforeEach(function() {
-	$0
-});
-endsnippet
-
-snippet aft "after each (js)" b
-afterEach(function() {
-	$0
-});
-endsnippet
-
-snippet befa "before all (js)" b
-beforeAll(function() {
-	$0
-});
-endsnippet
-
-snippet afta "after all (js)" b
-afterAll(function() {
-	$0
-});
-endsnippet
-
-snippet any "any (js)" b
-jasmine.any($1)
-endsnippet
-
-snippet anyt "anything (js)" b
-jasmine.anything()
-endsnippet
-
-snippet objc "object containing (js)" b
-jasmine.objectContaining({
-	${VISUAL}$0
-});
-endsnippet
-
-snippet arrc "array containing (js)" b
-jasmine.arrayContaining([${1:value1}]);
-endsnippet
-
-snippet strm "string matching (js)" b
-jasmine.stringMatching("${1:matcher}")
-endsnippet
-
-snippet ru "runs (js)" b
-runs(function() {
-	$0
-});
-endsnippet
-
-snippet wa "waits (js)" b
-waits($1);
-endsnippet
-
-snippet ex "expect (js)" b
-expect(${1:target})$0;
-endsnippet
-
-snippet ee "expect to equal (js)" b
-expect(${1:target}).toEqual(${2:value});
-endsnippet
-
-snippet el "expect to be less than (js)" b
-expect(${1:target}).toBeLessThan(${2:value});
-endsnippet
-
-snippet eg "expect to be greater than (js)" b
-expect(${1:target}).toBeGreaterThan(${2:value});
-endsnippet
-
-snippet eb "expect to be (js)" b
-expect(${1:target}).toBe(${2:value});
-endsnippet
-
-snippet em "expect to match (js)" b
-expect(${1:target}).toMatch(${2:pattern});
-endsnippet
-
-snippet eha "expect to have attribute (js)" b
-expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet et "expect to be truthy (js)" b
-expect(${1:target}).toBeTruthy();
-endsnippet
-
-snippet ef "expect to be falsy (js)" b
-expect(${1:target}).toBeFalsy();
-endsnippet
-
-snippet ed "expect to be defined (js)" b
-expect(${1:target}).toBeDefined();
-endsnippet
-
-snippet eud "expect to be defined (js)" b
-expect(${1:target}).toBeUndefined();
-endsnippet
-
-snippet en "expect to be null (js)" b
-expect(${1:target}).toBeNull();
-endsnippet
-
-snippet ec "expect to contain (js)" b
-expect(${1:target}).toContain(${2:value});
-endsnippet
-
-snippet ev "expect to be visible (js)" b
-expect(${1:target}).toBeVisible();
-endsnippet
-
-snippet eh "expect to be hidden (js)" b
-expect(${1:target}).toBeHidden();
-endsnippet
-
-snippet notx "expect not (js)" b
-expect(${1:target}).not$0;
-endsnippet
-
-snippet note "expect not to equal (js)" b
-expect(${1:target}).not.toEqual(${2:value});
-endsnippet
-
-snippet notl "expect to not be less than (js)" b
-expect(${1:target}).not.toBeLessThan(${2:value});
-endsnippet
-
-snippet notg "expect to not be greater than (js)" b
-expect(${1:target})..not.toBeGreaterThan(${2:value});
-endsnippet
-
-snippet notm "expect not to match (js)" b
-expect(${1:target}).not.toMatch(${2:pattern});
-endsnippet
-
-snippet notha "expect to not have attribute (js)" b
-expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet nott "expect not to be truthy (js)" b
-expect(${1:target}).not.toBeTruthy();
-endsnippet
-
-snippet notf "expect not to be falsy (js)" b
-expect(${1:target}).not.toBeFalsy();
-endsnippet
-
-snippet notd "expect not to be defined (js)" b
-expect(${1:target}).not.toBeDefined();
-endsnippet
-
-snippet notn "expect not to be null (js)" b
-expect(${1:target}).not.toBeNull();
-endsnippet
-
-snippet notc "expect not to contain (js)" b
-expect(${1:target}).not.toContain(${2:value});
-endsnippet
-
-snippet notv "expect not to be visible (js)" b
-expect(${1:target}).not.toBeVisible();
-endsnippet
-
-snippet noth "expect not to be hidden (js)" b
-expect(${1:target}).not.toBeHidden();
-endsnippet
-
-snippet s "spy on (js)" b
-spyOn(${1:object}, '${2:method}')$0;
-endsnippet
-
-snippet sr "spy on and return (js)" b
-spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
-endsnippet
-
-snippet st "spy on and throw (js)" b
-spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
-endsnippet
-
-snippet sct "spy on and call through (js)" b
-spyOn(${1:object}, '${2:method}').and.callThrough();
-endsnippet
-
-snippet scf "spy on and call fake (js)" b
-spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
-endsnippet
-
-snippet ethbc "expect to have been called (js)" b
-expect(${1:target}).toHaveBeenCalled();
-endsnippet
-
-snippet nthbc "expect not to have been called (js)" b
-expect(${1:target}).not.toHaveBeenCalled();
-endsnippet
-
-snippet ethbcw "expect to have been called with (js)" b
-expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
-endsnippet
-
diff --git a/vim/UltiSnips/javascript-node.snippets b/vim/UltiSnips/javascript-node.snippets
deleted file mode 100644
index 7a14dee..0000000
--- a/vim/UltiSnips/javascript-node.snippets
+++ /dev/null
@@ -1,65 +0,0 @@
-priority -50
-
-snippet #! "shebang"
-#!/usr/bin/env node
-endsnippet
-
-snippet vreq "assign a CommonJS-style module to a var"
-var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
-endsnippet
-
-snippet ex "module.exports"
-module.exports = ${1};
-endsnippet
-
-snippet hcs "http.createServer"
-http.createServer(${1}).listen(${2});
-endsnippet
-
-snippet ncs "net.createServer"
-net.createServer(function(${1:socket}){
-	${1}.on('data', function(${3:data}){
-		${4}
-	});
-	${1}.on('end', function(){
-		${5}
-	});
-}).listen(${6:8124});
-endsnippet
-
-snippet pipe "pipe"
-pipe(${1:stream})${2}
-endsnippet
-
-# Express snippets
-
-snippet eget "express GET"
-${1:app}.get('${2}', ${3});
-endsnippet
-
-snippet epost "express POST"
-${1:app}.post('${2}', ${3});
-endsnippet
-
-snippet eput "express PUT"
-${1:app}.put('${2}', ${3});
-endsnippet
-
-snippet edelete "express DELETE"
-${1:app}.delete('${2}', ${3});
-endsnippet
-
-# process snippets
-
-snippet stdout "stdout"
-process.stdout
-endsnippet
-
-snippet stdin "stdin"
-process.stdin
-endsnippet
-
-snippet stderr "stderr"
-process.stderr
-endsnippet
-
diff --git a/vim/UltiSnips/javascript.snippets b/vim/UltiSnips/javascript.snippets
index c60cf6b..1ffa256 100644
--- a/vim/UltiSnips/javascript.snippets
+++ b/vim/UltiSnips/javascript.snippets
@@ -5,47 +5,62 @@ priority -30
 snippet def "define an AMD module"
 define([
 	'${1:backbone}'
-], function( 
-	${2:Name})
-) {
+], ( 
+	${2:Backbone})
+) => {
 	$0
 }
 endsnippet
 
 # Jasmine
 snippet des "Describe (js)" b
-describe('${1:description}', function() {
+describe('${1:description}', () => {
 	$0
 });
 endsnippet
 
 snippet it "it (js)" b
-it('${1:description}', function() {
+it('${1:description}', () => {
 	$0
 });
 endsnippet
 
 snippet bef "before each (js)" b
-beforeEach(function() {
+beforeEach(() => {
 	$0
 });
 endsnippet
 
 snippet aft "after each (js)" b
-afterEach(function() {
+afterEach(() => {
 	$0
 });
 endsnippet
 
 snippet befa "before all (js)" b
-beforeAll(function() {
+beforeAll(() => {
 	$0
 });
 endsnippet
 
 snippet afta "after all (js)" b
-afterAll(function() {
+afterAll(() => {
 	$0
 });
 endsnippet
+
+snippet scc "stub.callCount" b
+expect(${1:stub}.callCount).toEqual(${2:1});
+endsnippet
+
+snippet sca "stub.callCount and args" b
+expect(${1:stub}.callCount).toEqual(${2:1});
+expect($1.args[0][0]${2:.prop}).toEqual(${3:true});
+$0
+endsnippet
+
+snippet et "expect to be true" b
+expect(${1:toTest}).toEqual(true);
+$0
+endsnippet
 # vim:ft=snippets: