Revert change to go back to timer testing