Fix deprecation warnings.

The ScalaTest ```plusOrMinus``` was deprecated in favor of ```+-``` and ```choice``` in favor of ```choose```.
The corresponding tests are fixed and green.