Moved geocode tests to entry confirmation. Expanded TrapLocation class.