Fixed names in tests