fix for wrap around timer & testcases