Merge "Remove a.t.TestCase"