Updated tests to conform to new implementation of general Choice.