Hehe, yes, that was a pretty simple fix :D
Also, throw a PR together so I can grab it tonight before doing the restructure branch. If you come up with some unit tests to add just put them in the same branch and the PR will update automatically :-)
As for tests, yeah, they're pretty...