Remove chosen
Add messaging tests