Clean up the tests
Rename express-wrapper to express-middleware