Removed some deprecated uses of ShouldMatchers.