Added schedule and iterations
Clean-up and added timesheet test cases