Final fixes to ListTestsTemplate