Test timeouts tweaked