Refactoring

Splitting test code from timer code