Got tests working.

Removed default values for timeouts and throw errors properly.