moarrrr tests! 99% coverage now