Commented out the tests failing due to sinon fuck-uppery for now.