Updated for google+ tests.