Fix possible test failure depending on the order of execution of test methods