Update tests.
Add ability to change timeout.