See pull 363 and 442 :)

Great. I really hope these get pulled ASAP, having the tests all over the place in different forks is really confusing :(

JS