More unit test changes