Fixed unit-tests by updating constructors
Merge branch 'node' of github.com:dvanliere/funnel into node