Some changes in choice list. Added PHPUnit class and method.