CHOP-74. Got tests working with new express version.