Moved functions to timer.c Fixed kernel panics, tests fail