Improve timing tests