Added time control for test