fix bug with required message
update tests
Merge remote-tracking branch 'origin/master'