Minor changes in tests