Ticket_6: fixed test 2
Merge branch 'Ticket_6'
Ticket_13: fixed model, deleted choices
Ticket_13: fixed fixtures