massive test changes