Yea, it will be. I also removed half of the existing tests to save myself some typing. I'm not actually ready to merge this yet,