Final test fixes