Hold time offset constant during test.
Get rid of silly helper method.

It's a global var, so just treat it like one.
Restore logic for tracking registration changes.