Made some test changes