Further test changes