initial round of test changes