Switch a couple of tests over to gtest.