Stop using a global list to keep track of timers
Add test for tracking joining