Merge "Fix typo in skip_checks function of BaseTestCase class"