Blazej Floch

@maxnbk I fixed the issues you had (I hope). I'll open this up again for review.

Moved the test to test_utils.

Just rebased and resolved conflict with current master. I'll be looking into your feedback shortly. Sounds minimal and it seems we might be wanting to use this shortly which will...