Add timeout options. Changes to tests