Additional Voters and unit tests.
Interface and exceptions changes.