Fix instability in test battery

2 tests are showing instability in my environment. This change should fix the problems.