Unit test changes