Herp Derp. Fix unit tests