Well, only half of the tests are broken. Commented out for now will fix when I'm not shattered.