Updated tests to conform to new implementation of general Choice.
Merge branch 'IZPACK-1074' into personal