Rewrote all tests, fixed some stuff. Make it green again. :>