Fix few testsuite intermittent issues