remove invalid test
Cosmetic
Add a reset() method for testing, clean up really old code
Add onBroadcast test, polish code