add timeout
Add comments and remove second test