Add makeScheduler unit test
Add timer tests