Mo' tests

[pocketken]

Should probably try and ensure that all of the things that have tests in the upstream lib are tested here as well to ensure we're matching upstream behaviour.