Insert Choicefield for testing. Some small fixes.