Fix to ensure order of tests execution