Are these test changes necessary anymore?