Fixed depricatation isssues with matchers in tests.