Merge "Remove an unused variable in the BaseTestCase class"