fix merge, add express to devDependencies, clean up tests, fix API reference link