increased timeout for tests (because of typescript)
Merge branch 'tests' into develop