ChoiceFields were not populated with the correct value.
This ensures values are set correctly when instantiating a form with an existing instance.

All py.tests' are passing.