A bunch of test changes