Revert "Merge pull request #614 from pyprogrammer/patch-3"

This reverts commit 0a7a540c884934ee75f9134761b6eb0e9b5926f2, reversing
changes made to 080007c1b55b909068ff7e9e9ce3d07e7728252f.
Fix tests for invalid match cleanup to use the datastore stubs.

Tested by running tests, verifying 3 proper warnings happened.
Remove unneeded import.
merge fixes