Merge "Move isolated credential code to BaseTestCase"