Well I'm reworking the tests, but feel free to tear into the rest.