Tighten up expire test
Test re-registration
Stop depending on local clock

Fixes #1.