Refactored Match tests