Fix warnings (all deprecations) in tests

Warnings in test relate to deprecated syntax. These have been fixed and tests successfully run under both Scala 10 and Scala 11 (note Scala 11 requires Scalatest 11).