Added choice behaviors and adjusted unit test.