Add more tests

I think we're already off-topic for this pull-request. I think improving the message should be a separate issue.