Fix test failures due to test sequence