removed headquarters from with_state_code, added tests