misc test changes