Thanks for the pointers, there are actually a couple of incomplete tests. I'm reviewing that before merging your pull request, I might ask you to rebase later :) Thanks!