removed another of those tests with timeouts....
Merge branch 'develop'