fix editing for counties and states

add failing tests and fix problems with update methods copied and
pasted from locations_controller