Bug77253 TestCase Template mashup fixes