finalizing test changes