Timers added.
Refactored individual tests into a common one.