Reverted back the timeout, just use the constructor with timeout.
Credential test.
Added TODO comment
Reverted back the timeout, just use the constructor with timeout.