More test fixes
Bug fixes
use correct class for geodata
switch to actually using new geoip lookup code
fix model loading