Moar tests

(Test coverage of 94% \o/)