Improve tests
Add tests
Make test timeout configurable
Add timeout configuration tests