Merge "Add $tablesUsed for ApiTestCase"