Merge "Move test only initialization to each test setup."