Please rebase, I'm not sure when exactly I'll get to that. I'll make PR to your branch so commit with test will be part of this PR.