Add a few more tests
Remove timeout limit
Add 2 more tests