Changed family name to surname in all tests