Switching a few more places to glog.
Fixing tests in here.