Explicit builder, to eliminate races between threads in test suite (issu...

...e #204)