Replace deprecated test aliases.
Fixed spurious test failures for Expires being off by one second.