Forms: test fix, test for ChoiseControl