Fixed testDeleteTimer
Refactored some methods