Tests actually work now!

And started adding test helpers to make tests more understandable