Update make test
Remove thread module from compat
Add timeouts, fix make function
Update with tip