Change new tests from using ShouldMatchers to Matchers