Renamed TimeControl to more generic CallbackRegistrar.
Renamed test variables used. Now with 100% more generic!