PROVISIONR-48. Fix non-deterministic behavior in assembly / assembly-tests