Some sychronization in tests

Shooting in the dark, #53.