Fix up unit test env issues. Review thread: http://codereview.appspot.com/5087047/
1 file changed