Make suggested unit test changes