modified test data. Minor renaming