timer problem's solution and tests added