Updated Category Match and Search Tests