a whole bunch of test changes