Changed: increased timeouts in tests