Some test changes