Fix tests for invalid match cleanup to use the datastore stubs.

Tested by running tests, verifying 3 proper warnings happened.