Merge delay node test
Fixes #346
Closes #347
Merge branch 'zobalogh-delay-test'