Added time_tests hack