Fix JavaDoc
Increase thread timeout for tests