Renamed Test script to appropriately named Demo.
Minor corrections to test format; shouldn't be reinstantiating new instances if not necessary.
Added unit test for CallbackRegistrar class.
Made changes to CallbackRegistrar based on unit test feedback (minor cleanup).