* Clean up opt conf verifier and vote state tracker * Update test to follow new message and some knob * Rename