Add some changes to generation of Test Metadata's Federation