updated to have timeout
added timeouts to tests
added timeouts to tests
Merge branch 'develop'