added tests
fixed Timer class