small refactorings in ModelState.scala
ModelStateTest: message canceling test added