Small fixes in tests