Refactored the matchers to be generic so we can implement matching on all http parts instead of just bodies