Ahh... good catch, I didn't see that. 

I think creating a `fail_with_message_including` matcher is a fine solution, go for it!