Attempt to get more test coverage
Express4-specific expectations

Conditionals in a test are gross.  Contemplate a better solution.