increased default timeout, fixed presence of controller