cleanup timer spec
refcatored Timer and specs++