Fix unit testing instability