Fix names in test - still generating warnings