Updated version to express 4, fix test cases

Works with new versions and express 4