Update test conditional course so that it works.
Store locations in ReferenceLists so they can be converted.
Update acceptance test for field change.
Merge with Cale's change.
Cleanup.