update remove timebomb
update test per comment