Minor changes to test.