Added test for timer
Merge branch 'timerTest' into development