Ticking off more test fixes