Final test changes