Second round test changes