make test stuff run in the same thread
Merge branch 'test-threads' into dev-gradle