Improve relability of some test cases