fix a bad bug
Merge remote-tracking branch 'origin/master' into tests
Add express-middleware test
Fix small test regression