Update tests from deprecated syntax

This changes the package ShouldMatchers to Matchers since the former is deprecated in the latest scalatest.  Some other deprecated test syntax is removed as well.