Update comments
Updating tests, checking for 'completed' events being assigned