Adding cross store FTs
Fixing filtering in AtsTestFramework