Added WatchTower and associated tests
Minor cleanup in WatchTower