Here are some tests

@sahat, I'm calling it a night but I would like to discuss this with you tomorrow.