Fixed breaking test, and removed _ from globals.