Improve expectation for join table verification
Remove a hidden `if` in AssociationMatcher