introduced timeout in test case since it hands for ever if something goes wrong
Merge branch 'origin/test'