One election test

And a few fixes