Switching a few more places to glog.
Fixing tests in here.
Merge commit 'a64f1a634ff57f3902770cfc75bd10249d898245'