Restructure time tests