Add tests and tweak for Express 4.0.0.