More stringent fork/join behaviour.
Updating test data for mason.